diff --git a/ChangeLog b/ChangeLog
index 52876d7012..f385fa9fa1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-21  Julien Moutte  <julien@fluendo.com>
+
+	* gst/tcp/gstmultifdsink.c: (setup_dscp_client): Use IPPROTO_IP
+	instead of SOL_IP, works on more platforms.
+	* gst/typefind/gsttypefindfunctions.c: (aac_type_find): Fix printf
+	arguments.
+
 2008-05-21  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* ext/vorbis/vorbisdec.c:
diff --git a/gst/tcp/gstmultifdsink.c b/gst/tcp/gstmultifdsink.c
index 50c599d553..e6c0775a1a 100644
--- a/gst/tcp/gstmultifdsink.c
+++ b/gst/tcp/gstmultifdsink.c
@@ -745,12 +745,13 @@ setup_dscp_client (GstMultiFdSink * sink, GstTCPClient * client)
   tos = (sink->qos_dscp & 0x3f) << 2;
   switch (af) {
     case AF_INET:
-      ret = setsockopt (client->fd.fd, SOL_IP, IP_TOS, &tos, sizeof (tos));
+      ret = setsockopt (client->fd.fd, IPPROTO_IP, IP_TOS, &tos, sizeof (tos));
       break;
     case AF_INET6:
 #ifdef IPV6_TCLASS
       ret =
-          setsockopt (client->fd.fd, SOL_IPV6, IPV6_TCLASS, &tos, sizeof (tos));
+          setsockopt (client->fd.fd, IPPROTO_IPV6, IPV6_TCLASS, &tos,
+          sizeof (tos));
       break;
 #endif
     default:
diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c
index c42842228d..003adaf52d 100644
--- a/gst/typefind/gsttypefindfunctions.c
+++ b/gst/typefind/gsttypefindfunctions.c
@@ -565,8 +565,8 @@ aac_type_find (GstTypeFind * tf, gpointer unused)
     snc = GST_READ_UINT16_BE (c.data);
     if (G_UNLIKELY ((snc & 0xfff6) == 0xfff0)) {
       /* ADTS header - find frame length */
-      GST_DEBUG ("Found one ADTS syncpoint at offset 0x%x, tracing next...",
-          c.offset);
+      GST_DEBUG ("Found one ADTS syncpoint at offset 0x%" G_GINT64_MODIFIER
+          "x, tracing next...", c.offset);
       len = ((c.data[3] & 0x03) << 11) |
           (c.data[4] << 3) | ((c.data[5] & 0xe0) >> 5);
 
@@ -585,8 +585,8 @@ aac_type_find (GstTypeFind * tf, gpointer unused)
 
         gst_type_find_suggest (tf, GST_TYPE_FIND_LIKELY, caps);
         gst_caps_unref (caps);
-        GST_DEBUG ("Found second ADTS-%d syncpoint at offset 0x%x, framelen %u",
-            mpegversion, c.offset, len);
+        GST_DEBUG ("Found second ADTS-%d syncpoint at offset 0x%"
+            G_GINT64_MODIFIER "x, framelen %u", mpegversion, c.offset, len);
         break;
       }