diff --git a/include/hardware/bluetooth.h b/include/hardware/bluetooth.h
index 68cbd1e..0f1a35b 100644
--- a/include/hardware/bluetooth.h
+++ b/include/hardware/bluetooth.h
@@ -438,7 +438,7 @@
     int (*init)(bt_callbacks_t* callbacks );
 
     /** Enable Bluetooth. */
-    int (*enable)(bool guest_mode);
+    int (*enable)(void);
 
     /** Disable Bluetooth. */
     int (*disable)(void);
diff --git a/include/hardware/power.h b/include/hardware/power.h
index 10612f3..2625482 100644
--- a/include/hardware/power.h
+++ b/include/hardware/power.h
@@ -46,7 +46,8 @@
      */
     POWER_HINT_VIDEO_ENCODE = 0x00000003,
     POWER_HINT_VIDEO_DECODE = 0x00000004,
-    POWER_HINT_LOW_POWER = 0x00000005
+    POWER_HINT_LOW_POWER = 0x00000005,
+    POWER_HINT_FOREGROUND_LOAD = 0x00000006
 } power_hint_t;
 
 typedef enum {
diff --git a/modules/sensors/multihal.cpp b/modules/sensors/multihal.cpp
index cd67f6d..d1536f4 100644
--- a/modules/sensors/multihal.cpp
+++ b/modules/sensors/multihal.cpp
@@ -34,6 +34,8 @@
 #include <dlfcn.h>
 #include <SensorEventQueue.h>
 
+#include <limits.h>
+#include <stdlib.h>
 
 static const char* CONFIG_FILENAME = "/system/etc/sensors/hals.conf";
 static const char* LEGAL_SUBHAL_PATH_PREFIX = "/system/lib/hw/";
@@ -127,7 +129,7 @@
     return global_handle;
 }
 
-static const int SENSOR_EVENT_QUEUE_CAPACITY = 20;
+static const int SENSOR_EVENT_QUEUE_CAPACITY = 36;
 
 struct TaskContext {
   sensors_poll_device_t* device;