diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index b7507d4..5cfe127 100755
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -20,4 +20,6 @@
 
 #define BTM_DEF_LOCAL_NAME   "Samsung Galaxy Note Pro 12.2"
 
+#define BTM_WBS_INCLUDED TRUE
+
 #endif
diff --git a/configs/thermal-engine-8974.conf b/configs/thermal-engine-8974.conf
index 8f46b05..88b26b4 100755
--- a/configs/thermal-engine-8974.conf
+++ b/configs/thermal-engine-8974.conf
@@ -4,105 +4,35 @@ sampling         5000
 algo_type        monitor
 sensor           cpu0
 sampling         65
-thresholds       120000
-thresholds_clr   115000
+thresholds       115000
+thresholds_clr   110000
 actions          shutdown
-action_info      70
+action_info      0
 
 [CPU1_MONITOR]
 algo_type        monitor
 sensor           cpu1
 sampling         65
-thresholds       120000
-thresholds_clr   115000
+thresholds       115000
+thresholds_clr   110000
 actions          shutdown
-action_info      70
+action_info      0
 
 [CPU2_MONITOR]
 algo_type        monitor
 sensor           cpu2
 sampling         65
-thresholds       120000
-thresholds_clr   115000
+thresholds       115000
+thresholds_clr   110000
 actions          shutdown
-action_info      70
+action_info      0
 
 [CPU3_MONITOR]
 algo_type        monitor
 sensor           cpu3
 sampling         65
-thresholds       120000
-thresholds_clr   115000
+thresholds       115000
+thresholds_clr   110000
 actions          shutdown
-action_info      70
+action_info      0
 
-[HOTPLUG-CPU1]
-sampling         65
-thresholds       110000
-thresholds_clr   95000
-
-[HOTPLUG-CPU2]
-sampling         65
-thresholds       110000
-thresholds_clr   95000
-
-[HOTPLUG-CPU3]
-sampling         65
-thresholds       110000
-thresholds_clr   95000
-
-[PID-CPU0]
-disable 1
-
-[PID-CPU1]
-disable 1
-
-[PID-CPU2]
-disable 1
-
-[PID-CPU3]
-disable 1
-
-[PID-POPMEM]
-disable 1
-
-[SS-CPU0]
-algo_type          ss
-sampling           65
-sensor             cpu0
-device             cpu
-set_point          95000
-set_point_clr      55000
-
-[SS-CPU1]
-algo_type          ss
-sampling           65
-sensor             cpu1
-device             cpu
-set_point          95000
-set_point_clr      55000
-
-[SS-CPU2]
-algo_type          ss
-sampling           65
-sensor             cpu2
-device             cpu
-set_point          95000
-set_point_clr      55000
-
-[SS-CPU3]
-algo_type          ss
-sampling           65
-sensor             cpu3
-device             cpu
-set_point          95000
-set_point_clr      55000
-
-[SS-GPU]
-algo_type          ss
-sampling           65
-sensor             tsens_tz_sensor10
-device             gpu
-override		   20000
-set_point          95000
-set_point_clr      75000
diff --git a/device.mk b/device.mk
index 376b7b2..cfca8e8 100755
--- a/device.mk
+++ b/device.mk
@@ -155,6 +155,11 @@ PRODUCT_PACKAGES += \
     wcnss_service \
     wpa_supplicant
 
+# IPv6 tethering
+PRODUCT_PACKAGES += \
+    ebtables \
+    ethertypes
+
 # Boot animation
 TARGET_BOOTANIMATION_HALF_RES := true
 TARGET_SCREEN_WIDTH := 2560