diff --git a/client/hostinfo_win.cpp b/client/hostinfo_win.cpp
index 109b082106..0a07f37dea 100644
--- a/client/hostinfo_win.cpp
+++ b/client/hostinfo_win.cpp
@@ -1123,7 +1123,7 @@ bool is_avx_supported() {
 // see: http://www.intel.com/Assets/PDF/appnote/241618.pdf
 // see: http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/25481.pdf
 #define FEATURE_TEST(feature_set_supported, test, feature_name) \
-    if (feature_set_supported && test) strlcat(features, feature_name, features_size - strlen(features))
+    if (feature_set_supported && test) strlcat(features, feature_name, features_size)
 
 int get_processor_features(char* vendor, char* features, int features_size) {
     unsigned int std_eax = 0, std_ebx = 0, std_ecx = 0, std_edx = 0;
diff --git a/lib/boinc_win.h b/lib/boinc_win.h
index 45e25b163e..9227f1f846 100644
--- a/lib/boinc_win.h
+++ b/lib/boinc_win.h
@@ -101,15 +101,12 @@
 // platforms we are going to disable the deprecation warnings if we are compiling
 // on Visual Studio 2005
 #if _MSC_VER >= 1400
-
-//#ifndef _CRT_SECURE_NO_DEPRECATE
-//#define _CRT_SECURE_NO_DEPRECATE
-//#endif
-
-//#ifndef _CRT_SECURE_NO_WARNINGS
-//#define _CRT_SECURE_NO_WARNINGS
-//#endif
-
+#ifndef _CRT_SECURE_NO_DEPRECATE
+#define _CRT_SECURE_NO_DEPRECATE
+#endif
+#ifndef _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS
+#endif
 #endif
 
 // Target Windows XP or better with Internet Explorer 5.01 or better