diff --git a/source/lib/pch/pch_warnings.h b/source/lib/pch/pch_warnings.h
index 75f552221c..8f457cc733 100644
--- a/source/lib/pch/pch_warnings.h
+++ b/source/lib/pch/pch_warnings.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -34,6 +34,7 @@
 # pragma warning(disable:4127)	// conditional expression is constant; rationale: see STMT in lib.h.
 # pragma warning(disable:4324)	// structure was padded due to __declspec(align())
 # pragma warning(disable:4574)	// macro is defined to be 0
+# pragma warning(disable:4456)	// hides previous local declaration
 # pragma warning(disable:4355)	// 'this' used in base member initializer list
 # pragma warning(disable:4512)	// assignment operator could not be generated
 # pragma warning(disable:4718)	// recursive call has no side effects, deleting
diff --git a/source/ps/DllLoader.cpp b/source/ps/DllLoader.cpp
index 18151ad8cb..c026157377 100644
--- a/source/ps/DllLoader.cpp
+++ b/source/ps/DllLoader.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -41,9 +41,9 @@ static CStr g_Libdir = "";
 
 // note: on Linux, lib is prepended to the SO file name
 #if OS_UNIX
-static CStr prefix = "lib";
+static CStr g_DllPrefix = "lib";
 #else
-static CStr prefix = "";
+static CStr g_DllPrefix = "";
 #endif
 
 // we usually want to use the same debug/release build type as the
@@ -99,7 +99,7 @@ static CStr GenerateFilename(const CStr& name, const CStr& suffix, const CStr& e
 	}
 #endif
 
-	n += prefix + name + suffix + extension;
+	n += g_DllPrefix + name + suffix + extension;
 	return n;
 }
 
diff --git a/source/rlinterface/RLInterface.cpp b/source/rlinterface/RLInterface.cpp
index 5312a9b1dc..203d7d1643 100644
--- a/source/rlinterface/RLInterface.cpp
+++ b/source/rlinterface/RLInterface.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -371,6 +371,8 @@ void Interface::ApplyMessage(const GameMessage& msg)
 			m_MsgLock.unlock();
 			break;
 		}
+		default:
+		break;
 	}
 }