diff --git a/libraries/bzip2/CMakeLists.txt b/libraries/bzip2/CMakeLists.txt
index 6ca7a4e6d9..452954c8a7 100644
--- a/libraries/bzip2/CMakeLists.txt
+++ b/libraries/bzip2/CMakeLists.txt
@@ -2,6 +2,10 @@ cmake_minimum_required( VERSION 3.1.0 )
 
 make_release_only()
 
+if (MSVC)
+	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244" )
+endif()
+
 add_definitions( -DBZ_NO_STDIO )
 add_library( bz2 STATIC
     blocksort.c
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cd69f02092..2f1eb068eb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1484,6 +1484,9 @@ source_group("Common\\Third Party\\RapidJSON" REGULAR_EXPRESSION "^${CMAKE_CURRE
 source_group("Common\\Third Party\\SFMT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/thirdparty/sfmt/.+")
 source_group("Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/utility/.+")
 source_group("Utility\\Node Builder" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/utility/nodebuilder/.+")
+source_group("Utility\\Smackerdec" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/smackerdec/.+")
+source_group("Utility\\Smackerdec\\Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/libsmackerdec/include/.+")
+source_group("Utility\\Smackerdec\\Sources" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/libsmackerdec/src/.+")
 source_group("Statusbar" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_statusbar/.+")
 source_group("Versioning" FILES version.h win32/zdoom.rc)
 source_group("Xlat" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/xlat/.+" FILES ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.c ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.h)
diff --git a/src/gamedata/d_dehacked.cpp b/src/gamedata/d_dehacked.cpp
index 5543a42df1..2351536162 100644
--- a/src/gamedata/d_dehacked.cpp
+++ b/src/gamedata/d_dehacked.cpp
@@ -1142,7 +1142,7 @@ static int PatchThing (int thingy)
 		size_t linelen = strlen (Line1);
 
 		// Supported value range is all valid representations of signed int and unsigned int.
-		if (errno == ERANGE || val < INT_MIN || val > UINT_MAX)
+		if (val < INT_MIN || val > UINT_MAX)
 		{
 			Printf("Bad numeric constant %s for %s\n", Line2, Line1);
 		}