diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0ef3b7375b..f5e47e4299 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,14 +1,15 @@
 ## Questions about OpenELEC?
 
-To get your questions answered, please ask in the OpenELEC [Forum] or on IRC: #openelec on freenode.net or [webchat] 
+To get your questions answered, please ask in the OpenELEC [Forum], on IRC: 
+#openelec on freenode.net, or [webchat]. 
 
 Do not open an issue.
 
 ## Issue Reports
 
-If you are at all unsure whether it's a bug in OpenELEC or a problem with something
-else, post in the OpenELEC [Forum] instead. If it turns out that it is a bug, an issue
-can always bee opend later.
+If you are at all unsure whether it's a bug in OpenELEC or a problem with 
+something else, post in the OpenELEC [Forum] instead. If it turns out that it is
+a bug, an issue can always be opened later.
 
 If you are sure that it's a bug in OpenELEC and you have not found a [similar issue], open a new [issue]
 and try to answer the following questions:
@@ -24,7 +25,8 @@ Make sure to specify which version of OpenELEC you are using.
 - OpenELEC build
 - OpenELEC arch
 
-Please don't paste log messages in the issue reports or issue comments use [sprunge.us](http://sprunge.us) instead
+Please don't paste log messages in the issue reports or issue comments - use 
+[sprunge.us](http://sprunge.us) instead.
 
 Feature requests are great, but they usually end up lying around the issue
 tracker indefinitely. Sending a pull request is a much better way of getting a
diff --git a/packages/debug/gdb/package.mk b/packages/debug/gdb/package.mk
index 8fe274d375..438f0dbfb3 100644
--- a/packages/debug/gdb/package.mk
+++ b/packages/debug/gdb/package.mk
@@ -38,6 +38,11 @@ PKG_AUTORECONF="no"
 CC_FOR_BUILD="$HOST_CC"
 CFLAGS_FOR_BUILD="$HOST_CFLAGS"
 
+pre_configure_target() {
+    strip_gold
+    strip_lto
+}
+
 PKG_CONFIGURE_OPTS_TARGET="bash_cv_have_mbstate_t=set \
                            --disable-shared \
                            --enable-static \
diff --git a/packages/x11/app/setxkbmap/scripts/xkb-setup b/packages/x11/app/setxkbmap/scripts/xkb-setup
index 6ecdea34b7..04a8c4017e 100755
--- a/packages/x11/app/setxkbmap/scripts/xkb-setup
+++ b/packages/x11/app/setxkbmap/scripts/xkb-setup
@@ -20,6 +20,6 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-if [ -f $CONFIG_CACHE/xkb/layout ] ; then
-  cat $CONFIG_CACHE/xkb/layout
+if [ -f /storage/.cache/xkb/layout ] ; then
+  cat /storage/.cache/xkb/layout
 fi
diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf
index 7de3e32119..565c5f614c 100644
--- a/projects/ARCTIC_MC/linux/linux.x86_64.conf
+++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf
@@ -432,7 +432,7 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init i915.i915_enable_rc6=0"
+CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf
index a68f435937..75eba7fc4d 100644
--- a/projects/Virtual/linux/linux.i386.conf
+++ b/projects/Virtual/linux/linux.i386.conf
@@ -444,7 +444,7 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init i915.i915_enable_rc6=0"
+CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf
index 7de3e32119..565c5f614c 100644
--- a/projects/Virtual/linux/linux.x86_64.conf
+++ b/projects/Virtual/linux/linux.x86_64.conf
@@ -432,7 +432,7 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init i915.i915_enable_rc6=0"
+CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init"
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y