diff --git a/src/p_tags.cpp b/src/p_tags.cpp
index d6f509f847..aca18f633f 100644
--- a/src/p_tags.cpp
+++ b/src/p_tags.cpp
@@ -39,8 +39,6 @@
 #include "g_levellocals.h"
 #include "vm.h"
 
-FTagManager tagManager;
-
 //-----------------------------------------------------------------------------
 //
 //
@@ -296,7 +294,11 @@ void FTagManager::DumpTags()
 
 CCMD(dumptags)
 {
-	tagManager.DumpTags();
+	ForAllLevels([](FLevelLocals *Level)
+	{
+		Printf("%s - %s\n", Level->MapName.GetChars(), Level->LevelName.GetChars());
+		Level->tagManager.DumpTags();
+	}
 }
 
 //-----------------------------------------------------------------------------
diff --git a/src/serializer.cpp b/src/serializer.cpp
index 38c0890e76..668d475a76 100644
--- a/src/serializer.cpp
+++ b/src/serializer.cpp
@@ -60,7 +60,6 @@
 #include "cmdlib.h"
 #include "g_levellocals.h"
 
-char nulspace[1024 * 1024 * 4];
 bool save_full = false;	// for testing. Should be removed afterward.
 
 int utf8_encode(int32_t codepoint, char *buffer, int *size)