diff --git a/BoardConfig.mk b/BoardConfig.mk
index 11a9b39..62b18e4 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -27,7 +27,6 @@ TARGET_NO_RADIOIMAGE := true
 
 BOARD_LDPI_RECOVERY := true
 
-TARGET_PREBUILT_RECOVERY_KERNEL := device/htc/click/custom/recovery_kernel
 TARGET_PREBUILT_KERNEL := device/htc/click/custom/kernel
 
 # Wifi related defines
diff --git a/click.mk b/click.mk
index f282a4c..8bfec23 100644
--- a/click.mk
+++ b/click.mk
@@ -32,7 +32,6 @@ PRODUCT_PACKAGES += \
     libOmxVidEnc \
     librpc \
     dhcpcd.conf \
-    com.android.future.usb.accessory \
     dexpreopt
 
 DISABLE_DEXPREOPT := false
@@ -69,7 +68,6 @@ PRODUCT_COPY_FILES += \
     frameworks/base/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
     frameworks/base/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
     frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
-    frameworks/base/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
     frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
 
 # keychars and keylayout files
diff --git a/custom/kernel b/custom/kernel
index deb9cc2..b412732 100755
Binary files a/custom/kernel and b/custom/kernel differ
diff --git a/custom/modules/wlan.ko b/custom/modules/wlan.ko
index 476bd09..c018516 100644
Binary files a/custom/modules/wlan.ko and b/custom/modules/wlan.ko differ
diff --git a/custom/recovery_kernel b/custom/recovery_kernel
deleted file mode 100755
index 848915c..0000000
Binary files a/custom/recovery_kernel and /dev/null differ
diff --git a/custom/sysctl.conf b/custom/sysctl.conf
index 630b456..e4f2043 100644
--- a/custom/sysctl.conf
+++ b/custom/sysctl.conf
@@ -10,7 +10,3 @@ vm.vfs_cache_pressure = 10
 vm.oom_kill_allocating_task = 1
 vm.min_free_kbytes = 4096
 vm.swappiness = 50
-
-# Misc tweaks for battery life
-vm.dirty_writeback_centisecs = 1000
-vm.dirty_expire_centisecs = 500
diff --git a/libgralloc/framebuffer.cpp b/libgralloc/framebuffer.cpp
index 24205fa..3840473 100644
--- a/libgralloc/framebuffer.cpp
+++ b/libgralloc/framebuffer.cpp
@@ -290,7 +290,7 @@ int mapFrameBufferLocked(struct private_module_t* module)
 
     int err;
     size_t fbSize = roundUpToPageSize(finfo.line_length * info.yres_virtual);
-    module->framebuffer = new private_handle_t(dup(fd), fbSize,
+    module->framebuffer = new private_handle_t(fd, fbSize,
             private_handle_t::PRIV_FLAGS_USES_PMEM);
 
     module->numBuffers = info.yres_virtual / info.yres;