diff --git a/ctaocrypt/src/aes.c b/ctaocrypt/src/aes.c
index 9d2102488..c598d8c8b 100644
--- a/ctaocrypt/src/aes.c
+++ b/ctaocrypt/src/aes.c
@@ -777,8 +777,8 @@ void AES_256_Key_Expansion(const unsigned char* userkey,
                            unsigned char* key_schedule);
 
 
-int AES_set_encrypt_key (const unsigned char *userKey, const int bits,
-                         Aes* aes)
+static int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
+                               Aes* aes)
 { 
     if (!userKey || !aes)
         return BAD_FUNC_ARG;
@@ -799,8 +799,8 @@ int AES_set_encrypt_key (const unsigned char *userKey, const int bits,
 }
 
 
-int AES_set_decrypt_key (const unsigned char* userKey, const int bits,
-                         Aes* aes)
+static int AES_set_decrypt_key(const unsigned char* userKey, const int bits,
+                               Aes* aes)
 {
     int nr;
     Aes temp_key;
diff --git a/m4/ax_harden_compiler_flags.m4 b/m4/ax_harden_compiler_flags.m4
index 360d56a5e..74fd414cd 100644
--- a/m4/ax_harden_compiler_flags.m4
+++ b/m4/ax_harden_compiler_flags.m4
@@ -60,7 +60,6 @@
   AC_DEFUN([AX_HARDEN_LINKER_FLAGS], [
       AC_REQUIRE([AX_CHECK_LINK_FLAG])
       AC_REQUIRE([AX_VCS_CHECKOUT])
-      AC_REQUIRE([AX_DEBUG])
 
       AS_IF([test "$ac_cv_vcs_checkout" = yes], [
           AX_CHECK_LINK_FLAG([-Werror])
@@ -74,9 +73,7 @@
 
       AC_LANG_PUSH([C])
       AS_IF([test "$ax_with_debug" = yes], [
-        AX_APPEND_COMPILE_FLAGS([-O0])],[
-        AX_APPEND_COMPILE_FLAGS([-O2])
-        ])
+        AX_APPEND_COMPILE_FLAGS([-O0])],[])
 
       ac_cv_warnings_as_errors=no
       AS_IF([test "$ac_cv_vcs_checkout" = yes], [
diff --git a/sslSniffer/sslSniffer.vcproj b/sslSniffer/sslSniffer.vcproj
index 1a4ca9b1d..b0b8c78b0 100755
--- a/sslSniffer/sslSniffer.vcproj
+++ b/sslSniffer/sslSniffer.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../"
-				PreprocessorDefinitions="CYASSL_SNIFFER;SSL_SNIFFER_EXPORTS"
+				PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512;NO_PSK;CYASSL_SNIFFER;SSL_SNIFFER_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -118,7 +118,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="../"
-				PreprocessorDefinitions="CYASSL_SNIFFER;SSL_SNIFFER_EXPORTS"
+				PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512;NO_PSK;CYASSL_SNIFFER;SSL_SNIFFER_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
diff --git a/sslSniffer/sslSnifferTest/snifftest.c b/sslSniffer/sslSnifferTest/snifftest.c
index adeb552cb..e7cc499fa 100755
--- a/sslSniffer/sslSnifferTest/snifftest.c
+++ b/sslSniffer/sslSnifferTest/snifftest.c
@@ -79,14 +79,16 @@ static void sig_handler(const int sig)
 #ifndef _WIN32
     ssl_FreeSniffer();
 #endif
-    exit(EXIT_SUCCESS);
+    if (sig)
+        exit(EXIT_SUCCESS);
 }
 
 
 static void err_sys(const char* msg)
 {
 	fprintf(stderr, "%s\n", msg);
-	exit(EXIT_FAILURE);
+    if (msg)
+	    exit(EXIT_FAILURE);
 }
 
 
@@ -149,7 +151,9 @@ int main(int argc, char** argv)
                     " installed correctly and you have sufficient permissions");
 
 	    printf("Enter the interface number (1-%d): ", i);
-	    scanf("%d", &inum);
+	    ret = scanf("%d", &inum);
+        if (ret != 1)
+            printf("scanf port failed\n");
 
 	    if (inum < 1 || inum > i)
 		    err_sys("Interface number out of range");
@@ -196,7 +200,9 @@ int main(int argc, char** argv)
         if (ret != 0) printf("pcap_activate failed %s\n", pcap_geterr(pcap));
 
 	    printf("Enter the port to scan: ");
-	    scanf("%d", &port);
+	    ret = scanf("%d", &port);
+        if (ret != 1)
+            printf("scanf port failed\n");
 
 	    SNPRINTF(filter, sizeof(filter), "tcp and port %d", port);
 
diff --git a/sslSniffer/sslSnifferTest/sslSniffTest.vcproj b/sslSniffer/sslSnifferTest/sslSniffTest.vcproj
index 0a45e3ea1..ff9977fa9 100755
--- a/sslSniffer/sslSnifferTest/sslSniffTest.vcproj
+++ b/sslSniffer/sslSnifferTest/sslSniffTest.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../WpdPack/Include;../../include"
+				AdditionalIncludeDirectories="../../../WpdPack/Include;../.."
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -117,7 +117,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../../WpdPack/Include;../../include"
+				AdditionalIncludeDirectories="../../../WpdPack/Include;../.."
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"