diff --git a/power-common.c b/power-common.c
index 8b6904c..4c0fc44 100644
--- a/power-common.c
+++ b/power-common.c
@@ -78,11 +78,9 @@ void power_hint(power_hint_t hint, void *data)
         return;
     }
     switch(hint) {
-        case POWER_HINT_VSYNC:
-        break;
         case POWER_HINT_VR_MODE:
             ALOGI("VR mode power hint not handled in power_hint_override");
-            break;
+        break;
         case POWER_HINT_INTERACTION:
         {
             int resources[] = {0x702, 0x20F, 0x30F};
@@ -100,16 +98,16 @@ void power_hint(power_hint_t hint, void *data)
 
                 if (handles[hint].handle > 0)
                     handles[hint].ref_count++;
-            }
-            else
+            } else {
                 if (handles[hint].handle > 0) {
                     if (--handles[hint].ref_count == 0) {
                         release_request(handles[hint].handle);
                         handles[hint].handle = 0;
                     }
-                }
-                else
+                } else {
                     ALOGE("Lock for hint: %X was not acquired, cannot be released", hint);
+                }
+            }
         break;
         default:
         break;
diff --git a/utils.c b/utils.c
index d9ecb84..a9bfda2 100644
--- a/utils.c
+++ b/utils.c
@@ -231,7 +231,7 @@ void interaction(int duration, int num_args, int opt_list[])
 #ifdef INTERACTION_BOOST
     static int lock_handle = 0;
 
-    if (duration < 0 || num_args < 1 || opt_list[0] == NULL)
+    if (duration < 0 || num_args < 1 || opt_list[0] == 0)
         return;
 
     if (qcopt_handle) {
@@ -246,7 +246,7 @@ void interaction(int duration, int num_args, int opt_list[])
 
 int interaction_with_handle(int lock_handle, int duration, int num_args, int opt_list[])
 {
-    if (duration < 0 || num_args < 1 || opt_list == NULL)
+    if (duration < 0 || num_args < 1 || opt_list[0] == 0)
         return 0;
 
     if (qcopt_handle) {
diff --git a/utils.h b/utils.h
index ab804dd..9859bea 100644
--- a/utils.h
+++ b/utils.h
@@ -42,6 +42,7 @@ int is_interactive_governor(char*);
 void perform_hint_action(int hint_id, int resource_values[],
     int num_resources);
 void undo_hint_action(int hint_id);
+void undo_initial_hint_action();
 void release_request(int lock_handle);
 int interaction_with_handle(int lock_handle, int duration, int num_args, int opt_list[]);
 int perf_hint_enable(int hint_id, int duration);