diff --git a/packages/graphics/cairo/build b/packages/graphics/cairo/build
index 511d0f2170..fc72d8277e 100755
--- a/packages/graphics/cairo/build
+++ b/packages/graphics/cairo/build
@@ -10,7 +10,7 @@ $SCRIPTS/build libpng
 $SCRIPTS/build pixman
 $SCRIPTS/build libXrender
 $SCRIPTS/build libX11
-# $SCRIPTS/build libxcb
+#$SCRIPTS/build libxcb
 
 cd $PKG_BUILD
 
@@ -22,8 +22,11 @@ cd $PKG_BUILD
             --disable-static \
             --enable-shared \
             --enable-png \
-            --enable-svg=yes \
-            --enable-xcb=no
+            --enable-ps \
+            --enable-pdf \
+            --enable-svg \
+            --enable-xlib \
+            --disable-gtk-doc \
 
 make
 
diff --git a/packages/network/samba/init.d/23_samba b/packages/network/samba/init.d/23_samba
index dbe65123e8..2fac4acacb 100755
--- a/packages/network/samba/init.d/23_samba
+++ b/packages/network/samba/init.d/23_samba
@@ -3,7 +3,7 @@
 # runlevels: openelec, text, debug
 
 (
-    progress  "Starting Samba server"
+  progress  "Starting Samba server"
 
-    /usr/bin/smbd -D > /dev/null 2>&1
+  smbd -D > /dev/null 2>&1
 )&
diff --git a/packages/plugins/SABnzbd/conf.d/SABnzbd b/packages/plugins/SABnzbd/conf.d/SABnzbd
index adb0937c04..d335da3e76 100644
--- a/packages/plugins/SABnzbd/conf.d/SABnzbd
+++ b/packages/plugins/SABnzbd/conf.d/SABnzbd
@@ -8,7 +8,7 @@
 #-------------------------------------------------------------------------------
 # SABnzbd config file.
 #-------------------------------------------------------------------------------
-SABNZBD_CONFIG=/storage/.sabnzbd/sabnzbd.conf
+SABNZBD_CONFIG=~/.sabnzbd/sabnzbd.conf
 
 #-------------------------------------------------------------------------------
 # SABnzbd host and port (example: 0.0.0.0:8080)
diff --git a/packages/sysutils/ConsoleKit/install b/packages/sysutils/ConsoleKit/install
index ea4b381984..22cad875cc 100755
--- a/packages/sysutils/ConsoleKit/install
+++ b/packages/sysutils/ConsoleKit/install
@@ -32,16 +32,16 @@ mkdir -p $INSTALL/usr/bin
 mkdir -p $INSTALL/usr/lib
   cp -PR $PKG_BUILD/libck-connector/.libs/*.so* $INSTALL/usr/lib
 
-# mkdir -p $INSTALL/usr/lib/ConsoleKit
-#   cp -PR $PKG_BUILD/tools/ck-collect-session-info $INSTALL/usr/lib/ConsoleKit
-#   cp -PR $PKG_BUILD/tools/ck-get-x11-display-device $INSTALL/usr/lib/ConsoleKit
-#   cp -PR $PKG_BUILD/tools/ck-get-x11-server-pid $INSTALL/usr/lib/ConsoleKit
+mkdir -p $INSTALL/usr/lib/ConsoleKit
+  cp -PR $PKG_BUILD/tools/ck-collect-session-info $INSTALL/usr/lib/ConsoleKit
+  cp -PR $PKG_BUILD/tools/ck-get-x11-display-device $INSTALL/usr/lib/ConsoleKit
+  cp -PR $PKG_BUILD/tools/ck-get-x11-server-pid $INSTALL/usr/lib/ConsoleKit
 
-# mkdir -p $INSTALL/usr/lib/ConsoleKit/run-seat.d
-# mkdir -p $INSTALL/usr/lib/ConsoleKit/run-session.d
-# mkdir -p $INSTALL/usr/lib/ConsoleKit/scripts
-#  cp -PR $PKG_BUILD/tools/linux/ck-system-restart $INSTALL/usr/lib/ConsoleKit/scripts
-#  cp -PR $PKG_BUILD/tools/linux/ck-system-stop $INSTALL/usr/lib/ConsoleKit/scripts
+mkdir -p $INSTALL/usr/lib/ConsoleKit/run-seat.d
+mkdir -p $INSTALL/usr/lib/ConsoleKit/run-session.d
+mkdir -p $INSTALL/usr/lib/ConsoleKit/scripts
+  cp -PR $PKG_BUILD/tools/linux/ck-system-restart $INSTALL/usr/lib/ConsoleKit/scripts
+  cp -PR $PKG_BUILD/tools/linux/ck-system-stop $INSTALL/usr/lib/ConsoleKit/scripts
 
 mkdir -p $INSTALL/usr/share/dbus-1/interfaces
   cp -PR $PKG_BUILD/src/org.freedesktop.ConsoleKit.Manager.xml $INSTALL/usr/share/dbus-1/interfaces
diff --git a/packages/x11/lib/pixman/install b/packages/x11/lib/pixman/install
index 8cc7b7ddcf..1dc6cd6db3 100755
--- a/packages/x11/lib/pixman/install
+++ b/packages/x11/lib/pixman/install
@@ -3,4 +3,4 @@
 . config/options
 
 mkdir -p $INSTALL/usr/lib
-cp -PR $PKG_BUILD/pixman/.libs/*.so* $INSTALL/usr/lib
+  cp -PR $PKG_BUILD/pixman/.libs/*.so* $INSTALL/usr/lib