diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 25c4807387..05a4fa5d71 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -384,8 +384,11 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
 	# Remove extra warnings when using the official DirectX headers.
 	# Also, TDM-GCC 4.4.0 no longer accepts glibc-style printf formats as valid,
 	# which is a royal pain. The previous version I had been using was fine with them.
+	# MinGW: switch to the Windows Unicode API.
 	if( WIN32 )
 		set( CMAKE_CXX_FLAGS "-Wno-unknown-pragmas -Wno-comment -Wno-format ${CMAKE_CXX_FLAGS}" )
+		set( CMAKE_CXX_FLAGS "-D_UNICODE -DUNICODE ${CMAKE_CXX_FLAGS}" )
+		set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -municode" )
 	endif()
 
 	# Detect FreeBSD and add flags
diff --git a/src/d_event.h b/src/d_event.h
index 4aeb4979c0..ef54c3a0ff 100644
--- a/src/d_event.h
+++ b/src/d_event.h
@@ -76,6 +76,7 @@ enum gameaction_t : int
 	ga_screenshot,
 	ga_togglemap,
 	ga_fullconsole,
+	ga_resumeconversation,
 };
 
 
diff --git a/src/g_game.cpp b/src/g_game.cpp
index 0f783ad070..6bfe200e06 100644
--- a/src/g_game.cpp
+++ b/src/g_game.cpp
@@ -74,6 +74,7 @@
 #include "gi.h"
 #include "a_dynlight.h"
 #include "i_system.h"
+#include "p_conversation.h"
 
 #include "g_hub.h"
 #include "g_levellocals.h"
@@ -1095,6 +1096,10 @@ void G_Ticker ()
 			AM_ToggleMap ();
 			gameaction = ga_nothing;
 			break;
+		case ga_resumeconversation:
+			P_ResumeConversation ();
+			gameaction = ga_nothing;
+			break;
 		default:
 		case ga_nothing:
 			break;
diff --git a/src/intermission/intermission.cpp b/src/intermission/intermission.cpp
index cc24822201..3e03035c10 100644
--- a/src/intermission/intermission.cpp
+++ b/src/intermission/intermission.cpp
@@ -804,7 +804,7 @@ void DIntermissionController::Ticker ()
 				primaryLevel->SetMusic();
 				gamestate = GS_LEVEL;
 				wipegamestate = GS_LEVEL;
-				P_ResumeConversation ();
+				gameaction = ga_resumeconversation;
 				viewactive = true;
 				Destroy();
 				break;
diff --git a/src/scripting/backend/dynarrays.cpp b/src/scripting/backend/dynarrays.cpp
index b95e02f4d0..d01a4557b9 100644
--- a/src/scripting/backend/dynarrays.cpp
+++ b/src/scripting/backend/dynarrays.cpp
@@ -783,6 +783,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Obj, Find, ArrayFind<FDynArray_Obj COMMA
 
 int ObjArrayPush(FDynArray_Obj *self, DObject *obj)
 {
+    if (self == nullptr) NullParam("\"self\"");
 	GC::WriteBarrier(obj);
 	return self->Push(obj);
 }
@@ -811,6 +812,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Obj, Delete, ArrayDelete<FDynArray_Obj>)
 
 void ObjArrayInsert(FDynArray_Obj *self,int index, DObject *obj)
 {
+    if (self == nullptr) NullParam("\"self\"");
 	GC::WriteBarrier(obj);
 	self->Insert(index, obj);
 }
diff --git a/src/utility/m_swap.h b/src/utility/m_swap.h
index a3e03bea2a..de9b7780a9 100644
--- a/src/utility/m_swap.h
+++ b/src/utility/m_swap.h
@@ -119,12 +119,12 @@ inline unsigned short BigShort(unsigned short x)
 	return x;
 }
 
-inline unsigned int BigLong(unsigned int &x)
+inline unsigned int BigLong(unsigned int x)
 {
 	return x;
 }
 
-inline int BigLong(int &x)
+inline int BigLong(int x)
 {
 	return x;
 }
diff --git a/src/win32/i_main.cpp b/src/win32/i_main.cpp
index ee43eab0cf..4f42f7593b 100644
--- a/src/win32/i_main.cpp
+++ b/src/win32/i_main.cpp
@@ -1111,7 +1111,8 @@ void DoomSpecificInfo (char *buffer, size_t bufflen)
 	int i;
 
 	buffer += mysnprintf (buffer, buffend - buffer, GAMENAME " version %s (%s)", GetVersionString(), GetGitHash());
-	buffer += mysnprintf (buffer, buffend - buffer, "\r\nCommand line: %s\r\n", GetCommandLine());
+	FString cmdline(GetCommandLineW());
+	buffer += mysnprintf (buffer, buffend - buffer, "\r\nCommand line: %s\r\n", cmdline.GetChars() );
 
 	for (i = 0; (arg = Wads.GetWadName (i)) != NULL; ++i)
 	{
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C0.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C0.lmp
index f6a85de060..99b151f12e 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C0.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C0.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C1.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C1.lmp
index 4f9cee771a..c7dc0efa66 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C1.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C1.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C2.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C2.lmp
index 0e1ca24311..7f5ccd7178 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C2.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C2.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C4.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C4.lmp
index fc935dac90..e3a5aa1cd6 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C4.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C4.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C8.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C8.lmp
index 27eab31ac4..b4f896f4d9 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C8.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C8.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C9.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C9.lmp
index 5b484d5799..ba4cbb93a9 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C9.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C9.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CA.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CA.lmp
index ee4f669e9d..c24063ee30 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CA.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CA.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CB.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CB.lmp
index 98f428501b..624aa66b79 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CB.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CB.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CC.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CC.lmp
index 6560c2ba70..f7dd1ee49f 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CC.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CC.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CD.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CD.lmp
index 4bafd8b2ec..87403a4f60 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CD.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CD.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CE.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CE.lmp
index ff19a7c40d..2dcedf4fd3 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CE.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CE.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CF.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CF.lmp
index e2534ddfa2..99264f4294 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CF.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CF.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D1.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D1.lmp
index 38784b44d5..618200805b 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D1.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D1.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D2.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D2.lmp
index 80788d6f9f..ce2887a7bc 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D2.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D2.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D3.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D3.lmp
index 9aebc7b42b..3067208429 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D3.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D3.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D4.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D4.lmp
index ef2dacfc5e..6b9794005a 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D4.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D4.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D6.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D6.lmp
index 8af056f02c..a339479da5 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D6.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D6.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D9.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D9.lmp
index 0c6ad26e9b..646c9c1ea3 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D9.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D9.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DA.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DA.lmp
index c24bc273cf..b3290b18f2 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DA.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DA.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DB.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DB.lmp
index b69367766e..43156b2074 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DB.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DB.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DC.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DC.lmp
index da7971a2f5..78e2ad2740 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DC.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DC.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DD.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DD.lmp
index 0b9179a65e..9999087d4f 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DD.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DD.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0150.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0150.lmp
index 24e9055593..d60a1ab340 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0150.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0150.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0170.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0170.lmp
index 9fad344057..59b3a145de 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0170.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0170.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0178.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0178.lmp
index 99a9692b81..1dcf6883ca 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0178.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0178.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0401.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0401.lmp
index 98f428501b..624aa66b79 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0401.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0401.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0419.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0419.lmp
index 5ddbda41d6..3c5bf84fe3 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0419.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0419.lmp differ