diff --git a/source/games/duke/src/cheats.cpp b/source/games/duke/src/cheats.cpp
index f02768441..a200a4046 100644
--- a/source/games/duke/src/cheats.cpp
+++ b/source/games/duke/src/cheats.cpp
@@ -149,7 +149,7 @@ const char* GameInterface::GenericCheat(int player, int cheat)
 
 	case CHT_NOCLIP:
 		ud.clipping = 1 - ud.clipping;
-		return quoteMgr.GetQuote(ud.clipping ? QUOTE_CHEAT_NOCLIP : QUOTE_CHEAT_NOCLIP);
+		return quoteMgr.GetQuote(ud.clipping ? QUOTE_CHEAT_NOCLIP : QUOTE_CHEAT_CLIP);
 
 	case CHT_UNLOCK:
 		return cheatUnlock();
diff --git a/source/glbackend/glbackend.cpp b/source/glbackend/glbackend.cpp
index 5a5ddd9b5..1b243dfc2 100644
--- a/source/glbackend/glbackend.cpp
+++ b/source/glbackend/glbackend.cpp
@@ -235,7 +235,7 @@ void PolymostRenderState::Apply(FRenderState& state, GLState& oldState)
 		oldState.DepthFunc = DepthFunc;
 	}
 	// Disable brightmaps if non-black fog is used.
-	if (!(Flags & RF_FogDisabled) && ShadeDiv >= 1 / 1000.f)
+	if (!(Flags & RF_FogDisabled) && ShadeDiv >= 1 / 1000.f && (GLInterface.useMapFog || FogColor))
 	{
 		state.EnableFog(1);
 	}