diff --git a/limelight-common/OpenAES/oaes_base64.c b/limelight-common/OpenAES/oaes_base64.c
index 153689d..910e193 100644
--- a/limelight-common/OpenAES/oaes_base64.c
+++ b/limelight-common/OpenAES/oaes_base64.c
@@ -129,6 +129,9 @@ OAES_RET oaes_base64_decode(
   if( _out_len_req > *out_len )
       return OAES_RET_ERROR;
 
+  // Satisfy overzealous compiler
+  memset(_buf1, 0, sizeof(_buf1));
+  
   memset(out, 0, *out_len);
   *out_len = 0;
   while( in_len-- && strchr(_oaes_base64_table, in[_idx++]) )
diff --git a/limelight-common/Platform.h b/limelight-common/Platform.h
index 2418c96..ae5a00c 100644
--- a/limelight-common/Platform.h
+++ b/limelight-common/Platform.h
@@ -14,6 +14,7 @@
 #include <pthread.h>
 #include <sys/time.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #endif
 
 #ifdef _WIN32
@@ -47,7 +48,9 @@ void LimelogWindows(char* Format, ...);
  #endif
 #else
  #ifndef LC_DEBUG
-  #define NDEBUG
+  #ifndef NDEBUG
+   #define NDEBUG
+  #endif
  #endif
  #include <assert.h>
  #define LC_ASSERT(x) assert(x)