--- libgpod-0.8.3.orig/src/ithumb-writer.c
+++ libgpod-0.8.3/src/ithumb-writer.c
@@ -728,7 +728,7 @@
   {
       return gdk_pixbuf_rotate_simple (pixbuf, *rotation);
   }
-  return g_object_ref (G_OBJECT (pixbuf));
+  return GDK_PIXBUF(g_object_ref (G_OBJECT (pixbuf)));
 }
 
 /* On the iPhone, thumbnails are presented as squares in a grid.
@@ -968,7 +968,7 @@
     else if (thumb->data_type == ITDB_THUMB_TYPE_PIXBUF)
     {
         Itdb_Thumb_Pixbuf *thumb_pixbuf = (Itdb_Thumb_Pixbuf *)thumb;
-        pixbuf = g_object_ref (G_OBJECT (thumb_pixbuf->pixbuf));
+        pixbuf = GDK_PIXBUF(g_object_ref (G_OBJECT (thumb_pixbuf->pixbuf)));
     }
 
     if (pixbuf == NULL)
--- libgpod-0.8.3.orig/tools/generic-callout.c
+++ libgpod-0.8.3/tools/generic-callout.c
@@ -664,7 +664,7 @@
 }
 
 
-static char *get_info_from_usb (usb_bus_number, usb_device_number)
+static char *get_info_from_usb (gint usb_bus_number, gint usb_device_number)
 {
 #ifdef HAVE_LIBUSB
         return read_sysinfo_extended_from_usb (usb_bus_number,
