diff --git a/src/compress.cpp b/src/compress.cpp
index 7fa0eb10..6155ad85 100644
--- a/src/compress.cpp
+++ b/src/compress.cpp
@@ -101,7 +101,7 @@ int upx_compress           ( const upx_bytep src, unsigned  src_len,
     cresult->c_len = 0;
 #endif
 
-    if (0) {
+    if __acc_cte(0) {
     }
 #if (WITH_LZMA)
     else if (M_IS_LZMA(method))
@@ -147,7 +147,7 @@ int upx_decompress         ( const upx_bytep src, unsigned  src_len,
     if (cresult && cresult->method == 0)
         cresult = NULL;
 
-    if (0) {
+    if __acc_cte(0) {
     }
 #if (WITH_LZMA)
     else if (M_IS_LZMA(method))
@@ -194,7 +194,7 @@ int upx_test_overlap       ( const upx_bytep buf,
     unsigned overlap_overhead = src_off + src_len - *dst_len;
     assert((int)overlap_overhead > 0);
 
-    if (0) {
+    if __acc_cte(0) {
     }
 #if (WITH_LZMA)
     else if (M_IS_LZMA(method))
diff --git a/src/compress_lzma.cpp b/src/compress_lzma.cpp
index 4407c022..31b4cdcf 100644
--- a/src/compress_lzma.cpp
+++ b/src/compress_lzma.cpp
@@ -33,6 +33,9 @@
 #if (ACC_CC_MSC)
 #  pragma warning(disable: 4456) // -Wno-shadow
 #endif
+#if (ACC_CC_MSC && (_MSC_VER < 1900))
+#  pragma warning(disable: 4127) // warning C4127: conditional expression is constant
+#endif
 
 
 void lzma_compress_config_t::reset()
diff --git a/src/s_win32.cpp b/src/s_win32.cpp
index 76ff8806..18bee126 100644
--- a/src/s_win32.cpp
+++ b/src/s_win32.cpp
@@ -42,9 +42,9 @@
 
 #if (ACC_CC_MSC && (_MSC_VER >= 1000 && _MSC_VER < 1200))
 /* avoid -W4 warnings in <conio.h> */
-#pragma warning(disable : 4032)
+#pragma warning(disable: 4032)
 /* avoid -W4 warnings in <windows.h> */
-#pragma warning(disable : 4201 4214 4514)
+#pragma warning(disable: 4201 4214 4514)
 #endif
 #if defined(__RSXNT__)
 #define timeval win32_timeval /* struct timeval already in <sys/time.h> */