diff --git a/src/m_cheat.cpp b/src/m_cheat.cpp
index 3bab8f7e5..b6316f732 100644
--- a/src/m_cheat.cpp
+++ b/src/m_cheat.cpp
@@ -136,6 +136,7 @@ void cht_DoCheat (player_t *player, int cheat)
 			player->cheats &= ~CF_NOCLIP;
 			msg = GStrings("STSTR_NCOFF");
 		}
+		player->mo->velx = 1;	// force some lateral movement so that internal variables are up to date
 		break;
 
 	case CHT_NOVELOCITY:
diff --git a/src/p_3dfloors.cpp b/src/p_3dfloors.cpp
index 37ecaed27..b60c69e11 100644
--- a/src/p_3dfloors.cpp
+++ b/src/p_3dfloors.cpp
@@ -615,7 +615,7 @@ void P_Recalculate3DFloors(sector_t * sector)
 				newlight.flags = rover->flags;
 				lightlist.Push(newlight);
 			}
-			else //if (i==0)
+			else
 			{
 				fixed_t ff_bottom=rover->bottom.plane->ZatPoint(CenterSpot(sector));
 				if (ff_bottom<maxheight)