diff --git a/src/acs/ACSVM/ACSVM/ThreadExec.cpp b/src/acs/ACSVM/ACSVM/ThreadExec.cpp
index 6754800a4..374c143ec 100644
--- a/src/acs/ACSVM/ACSVM/ThreadExec.cpp
+++ b/src/acs/ACSVM/ACSVM/ThreadExec.cpp
@@ -9,7 +9,9 @@
 // Thread execution.
 //
 //-----------------------------------------------------------------------------
-
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
 #include "Thread.hpp"
 
 #include "Array.hpp"
diff --git a/src/p_setup.c b/src/p_setup.c
index 0fe36d2ed..899f5f618 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -9426,8 +9426,10 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, wadcompat_t compat)
 		{
 			name = lumpinfo->name;
 
-			if (P_CheckSoundReplacements(name, i));
+			if (P_CheckSoundReplacements(name, i))
+			{
 				continue;
+			}
 
 			if (!allvotereplaced && P_CheckVoteReplacements(name))
 				allvotereplaced = true;