diff --git a/source/games/sw/src/player.cpp b/source/games/sw/src/player.cpp
index efc7444ff..3f7cd8437 100644
--- a/source/games/sw/src/player.cpp
+++ b/source/games/sw/src/player.cpp
@@ -4935,6 +4935,8 @@ void FindMainSector(SECTOR_OBJECT* sop)
     if (sop->op_main_sector == nullptr)
     {
         auto oldpos = sop->pmid;
+        auto oldflags = sop->flags;
+        sop->flags &= ~SOBJ_DONT_ROTATE;    // This flag must be disabled here because it messes with the movement that's intended below.
 
         PlaceSectorObject(sop, { MAXSO, MAXSO });
 
@@ -4944,6 +4946,7 @@ void FindMainSector(SECTOR_OBJECT* sop)
         updatesectorz(oldpos, &sop->op_main_sector);
 
         PlaceSectorObject(sop, oldpos.XY());
+        sop->flags = oldflags;
     }
 }
 
diff --git a/source/games/sw/src/track.cpp b/source/games/sw/src/track.cpp
index b037d7816..3436e64e5 100644
--- a/source/games/sw/src/track.cpp
+++ b/source/games/sw/src/track.cpp
@@ -1766,7 +1766,7 @@ PlayerPart:
 
 void RefreshPoints(SECTOR_OBJECT* sop, const DVector2& move, bool dynamic)
 {
-    short wallcount = 0;
+    int wallcount = 0;
     DAngle delta_ang_from_orig;
 
     // do scaling