diff --git a/src/common/console/c_dispatch.cpp b/src/common/console/c_dispatch.cpp
index db1d6e25b2..03f3ebd461 100644
--- a/src/common/console/c_dispatch.cpp
+++ b/src/common/console/c_dispatch.cpp
@@ -486,7 +486,7 @@ void FUnsafeConsoleCommand::Run(FCommandLine &args, int key)
 {
 	if (UnsafeExecutionContext)
 	{
-		Printf(TEXTCOLOR_RED "Cannot execute unsafe command " TEXTCOLOR_GOLD "%s\n", m_Name);
+		Printf(TEXTCOLOR_RED "Cannot execute unsafe command " TEXTCOLOR_GOLD "%s\n", m_Name.GetChars());
 		return;
 	}
 
diff --git a/src/common/objects/dobjtype.h b/src/common/objects/dobjtype.h
index db0893b141..16adbf72fc 100644
--- a/src/common/objects/dobjtype.h
+++ b/src/common/objects/dobjtype.h
@@ -5,6 +5,8 @@
 #error You must #include "dobject.h" to get dobjtype.h
 #endif
 
+#include <limits.h>
+
 typedef std::pair<const class PType *, unsigned> FTypeAndOffset;
 
 #if 0
diff --git a/src/common/textures/formats/multipatchtexture.h b/src/common/textures/formats/multipatchtexture.h
index f9f5913e1d..190cd49b75 100644
--- a/src/common/textures/formats/multipatchtexture.h
+++ b/src/common/textures/formats/multipatchtexture.h
@@ -7,6 +7,8 @@
 #include "image.h"
 
 class FImageTexture;
+class FTextureManager;
+
 //==========================================================================
 //
 // TexPart is the data that will get passed to the final texture.