diff --git a/specs/usdf_zdoom.txt b/specs/usdf_zdoom.txt
index 217354292..839f9753a 100644
--- a/specs/usdf_zdoom.txt
+++ b/specs/usdf_zdoom.txt
@@ -63,6 +63,10 @@ either refuse loading dialogues with the 'ZDoom' namespace or if it does not
 outright abort on incompatible namespaces fail with a type mismatch error on
 one of the specified propeties.
 
+In addition ZDoom defines one new field in the top level of a conversation block:
+
+id = <integer>; 	Assigns a conversation ID for use in Thing_SetConversation or in UDMF's 'conversation' actor property.
+
 ZDoom-format dialogues need to start with the line:
 
 namespace = "ZDoom";
diff --git a/src/g_mapinfo.cpp b/src/g_mapinfo.cpp
index 4d7b3c7d2..5a39d7dbb 100644
--- a/src/g_mapinfo.cpp
+++ b/src/g_mapinfo.cpp
@@ -312,8 +312,13 @@ FString level_info_t::LookupLevelName()
 			{
 				mysnprintf (checkstring, countof(checkstring), "%d: ", atoi(&MapName[5]));
 			}
+			else
+			{
+				// make sure nothing is stripped.
+				checkstring[0] = '\0';
+			}
 			thename = strstr (lookedup, checkstring);
-			if (thename == NULL)
+			if (thename == NULL || thename == lookedup)
 			{
 				thename = lookedup;
 			}
diff --git a/src/thingdef/thingdef_codeptr.cpp b/src/thingdef/thingdef_codeptr.cpp
index 21dc93036..23a6f58cf 100644
--- a/src/thingdef/thingdef_codeptr.cpp
+++ b/src/thingdef/thingdef_codeptr.cpp
@@ -4249,6 +4249,7 @@ enum T_Flags
 	TF_NODESTFOG =		0x00000080, // Don't spawn any fog at the arrival position.
 	TF_USEACTORFOG =	0x00000100, // Use the actor's TeleFogSourceType and TeleFogDestType fogs.
 	TF_NOJUMP =			0x00000200, // Don't jump after teleporting.
+	TF_OVERRIDE =		0x00000400, // Ignore NOTELEPORT.
 };
 
 DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Teleport)
@@ -4270,8 +4271,11 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Teleport)
 		return;
 	}
 
-	if (ref->flags2 & MF2_NOTELEPORT)
+	if ((ref->flags2 & MF2_NOTELEPORT) && !(Flags & TF_OVERRIDE))
+	{
+		ACTION_SET_RESULT(false);
 		return;
+	}
 
 	// Randomly choose not to teleport like A_Srcr2Decide.
 	if (Flags & TF_RANDOMDECIDE)
@@ -4292,15 +4296,21 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Teleport)
 	}
 
 	DSpotState *state = DSpotState::GetSpotState();
-	if (state == NULL) 
+	if (state == NULL)
+	{
+		ACTION_SET_RESULT(false);
 		return;
+	}
 
 	if (!TargetType) 
 		TargetType = PClass::FindClass("BossSpot");
 
 	AActor * spot = state->GetSpotWithMinMaxDistance(TargetType, ref->x, ref->y, MinDist, MaxDist);
 	if (spot == NULL) 
+	{
+		ACTION_SET_RESULT(false);
 		return;
+	}
 
 	fixed_t prevX = ref->x;
 	fixed_t prevY = ref->y;
diff --git a/wadsrc/static/actors/constants.txt b/wadsrc/static/actors/constants.txt
index 2ded98bc7..6612dd9f8 100644
--- a/wadsrc/static/actors/constants.txt
+++ b/wadsrc/static/actors/constants.txt
@@ -199,6 +199,7 @@ enum
 	TF_NODESTFOG =		0x00000080, // Don't spawn any fog at the arrival position.
 	TF_USEACTORFOG =	0x00000100, // Use the actor's TeleFogSourceType and TeleFogDestType fogs.
 	TF_NOJUMP =			0x00000200, // Don't jump after teleporting.
+	TF_OVERRIDE =		0x00000400, // Ignore NOTELEPORT.
 
 	TF_KEEPORIENTATION = TF_KEEPVELOCITY|TF_KEEPANGLE,
 	TF_NOFOG = TF_NOSRCFOG|TF_NODESTFOG,