diff --git a/power-common.c b/power-common.c
index 0101bea..eb92998 100644
--- a/power-common.c
+++ b/power-common.c
@@ -101,14 +101,17 @@
                     handles[hint].ref_count++;
             }
             else
-                if (handles[hint].handle > 0)
+                if (handles[hint].handle > 0) {
                     if (--handles[hint].ref_count == 0) {
                         release_request(handles[hint].handle);
                         handles[hint].handle = 0;
                     }
+                }
                 else
                     ALOGE("Lock for hint: %X was not acquired, cannot be released", hint);
         break;
+        default:
+        break;
     }
 }
 
diff --git a/powerhintparser.c b/powerhintparser.c
index 6d8646f..4419285 100644
--- a/powerhintparser.c
+++ b/powerhintparser.c
@@ -34,7 +34,9 @@
 #include <libxml/tree.h>
 #include <unistd.h>
 #include "powerhintparser.h"
+#ifndef LOG_TAG
 #define LOG_TAG "QTI PowerHAL"
+#endif
 
 int parsePowerhintXML() {
 
diff --git a/utils.c b/utils.c
index f7f2251..d586df8 100644
--- a/utils.c
+++ b/utils.c
@@ -230,7 +230,7 @@
 
 int interaction_with_handle(int lock_handle, int duration, int num_args, int opt_list[])
 {
-    if (duration < 0 || num_args < 1 || opt_list[0] == NULL)
+    if (duration < 0 || num_args < 1 || opt_list == NULL)
         return 0;
 
     if (qcopt_handle) {