diff --git a/ChangeLog b/ChangeLog
index acb87487b8..5f86ed66ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-19  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* configure.ac:
+	  some docs I had
+	* ext/amrnb/amrnbenc.c: (gst_amrnbenc_chain):
+	  trivial fixes
+
 2005-10-18  Wim Taymans  <wim@fluendo.com>
 
 	* gst/realmedia/rmdemux.c: (gst_rmdemux_validate_offset),
diff --git a/configure.ac b/configure.ac
index 51d55a3287..531da2cc5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,8 @@ AC_ISC_POSIX
 
 AC_HEADER_STDC([])
 AC_C_INLINE
+
+dnl used by ext/a52dec
 AX_CREATE_STDINT_H
 
 dnl Check for malloc.h
@@ -179,10 +181,6 @@ AC_SUBST(GST_PLUGINS_BASE_CFLAGS)
 dnl Determine endianness
 AC_C_BIGENDIAN
 
-dnl Check for fast float to int casting as defined in C99
-AC_C99_FUNC_LRINT()
-AC_C99_FUNC_LRINTF()
-
 dnl Check for essential libraries first:
 dnl ====================================
 
diff --git a/ext/amrnb/amrnbenc.c b/ext/amrnb/amrnbenc.c
index c66b1ef63f..d82a66c1f2 100644
--- a/ext/amrnb/amrnbenc.c
+++ b/ext/amrnb/amrnbenc.c
@@ -192,6 +192,8 @@ gst_amrnbenc_chain (GstPad * pad, GstBuffer * buffer)
 
   amrnbenc = GST_AMRNBENC (GST_PAD_PARENT (pad));
 
+  g_return_val_if_fail (amrnbenc->handle, GST_FLOW_WRONG_STATE);
+
   if (amrnbenc->rate == 0 || amrnbenc->channels == 0)
     goto not_negotiated;
 
@@ -217,7 +219,7 @@ gst_amrnbenc_chain (GstPad * pad, GstBuffer * buffer)
 
     data = (guint8 *) gst_adapter_peek (amrnbenc->adapter, 320);
 
-    /* decode */
+    /* encode */
     outsize = Encoder_Interface_Encode (amrnbenc->handle, MR122, (short *) data,
         (guint8 *) GST_BUFFER_DATA (out), 0);