diff --git a/ChangeLog b/ChangeLog
index e013677321..e4a2dae991 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-13  Michael Smith <msmith@fluendo.com>
+
+	* ext/ogg/gstoggmux.c:
+	* gst/audioconvert/audioconvert.c: (float):
+	  Don't use LL suffix, as it's not portable, and neither of these
+	  uses required it anyway.
+
 2005-10-12  Stefan Kost  <ensonic@users.sf.net>
 
 	* examples/indexing/indexmpeg.c: (main):
diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c
index 63e5628eb7..36c6683273 100644
--- a/ext/ogg/gstoggmux.c
+++ b/ext/ogg/gstoggmux.c
@@ -131,8 +131,8 @@ enum
 };
 
 /* set to 0.5 seconds by default */
-#define DEFAULT_MAX_DELAY	500000000LL
-#define DEFAULT_MAX_PAGE_DELAY	500000000LL
+#define DEFAULT_MAX_DELAY	500000000
+#define DEFAULT_MAX_PAGE_DELAY	500000000
 enum
 {
   ARG_0,
diff --git a/gst/audioconvert/audioconvert.c b/gst/audioconvert/audioconvert.c
index 7e5f3e9190..e8e0eb6a1a 100644
--- a/gst/audioconvert/audioconvert.c
+++ b/gst/audioconvert/audioconvert.c
@@ -62,7 +62,7 @@ MAKE_UNPACK_FUNC_NAME (float) (gpointer src, gint32 * dst,
 
   for (; count; count--) {
     temp = *p++ * 2147483647.0f + .5;
-    *dst++ = (gint32) CLAMP (temp, -2147483648ll, 2147483647ll);
+    *dst++ = (gint32) CLAMP (temp, G_MININT, G_MAXINT);
   }
 }