diff --git a/source/games/exhumed/src/exhumedactor.h b/source/games/exhumed/src/exhumedactor.h
index 91170aedd..5aa91a9b6 100644
--- a/source/games/exhumed/src/exhumedactor.h
+++ b/source/games/exhumed/src/exhumedactor.h
@@ -244,11 +244,6 @@ inline void ChangeActorStat(DExhumedActor* actor, int stat)
 	changespritestat(actor->GetSpriteIndex(), stat);
 }
 
-inline void ChangeActorSect(DExhumedActor* actor, int stat)
-{
-	changespritesect(actor->GetSpriteIndex(), stat);
-}
-
 inline void ChangeActorSect(DExhumedActor* actor, sectortype* stat)
 {
 	changespritesect(actor->GetSpriteIndex(), sector.IndexOf(stat));
diff --git a/source/games/exhumed/src/queen.cpp b/source/games/exhumed/src/queen.cpp
index 0eb39fc6a..ca198dfae 100644
--- a/source/games/exhumed/src/queen.cpp
+++ b/source/games/exhumed/src/queen.cpp
@@ -121,7 +121,7 @@ Head QueenHead;
 int MoveQX[25];
 int MoveQY[25];
 int MoveQZ[25];
-int MoveQS[25];
+sectortype* MoveQS[25];
 int16_t MoveQA[25];
 
 FSerializer& Serialize(FSerializer& arc, const char* keyname, Queen& w, Queen* def)
@@ -382,13 +382,13 @@ void BuildTail()
     int x = pSprite->x;
     int y = pSprite->x;
     int z = pSprite->x;
-    int nSector =pSprite->sectnum;
+    auto pSector =pSprite->sector();
 
     int i;
 
     for (i = 0; i < kMaxTails; i++)
     {
-        auto pTailActor = insertActor(nSector, 121);
+        auto pTailActor = insertActor(pSector, 121);
         auto pTailSprite = &pTailActor->s();
         tailspr[i] = pTailActor;
 
@@ -415,8 +415,8 @@ void BuildTail()
         MoveQX[i] = x;
         MoveQZ[i] = z;
         MoveQY[i] = y;
-        assert(validSectorIndex(nSector));
-        MoveQS[i] = nSector;
+        assert(pSector);
+        MoveQS[i] = pSector;
     }
 
     nQHead = 0;
@@ -918,8 +918,8 @@ void AIQueenHead::Tick(RunListEvent* ev)
         MoveQX[nQHead] = pSprite->x;
         MoveQY[nQHead] = pSprite->y;
         MoveQZ[nQHead] = pSprite->z;
-        assert(validSectorIndex(pSprite->sectnum));
-        MoveQS[nQHead] = pSprite->sectnum;
+        assert(pSprite->sector());
+        MoveQS[nQHead] = pSprite->sector();
         MoveQA[nQHead] = pSprite->ang;
 
         nHd = nQHead;
@@ -932,15 +932,15 @@ void AIQueenHead::Tick(RunListEvent* ev)
                 //assert(nHd < 24 && nHd >= 0);
             }
 
-            int var_20 = MoveQS[nHd];
+            auto headSect = MoveQS[nHd];
             auto pTActor = tailspr[i];
             if (pTActor)
             {
                 auto pTSprite = &pTActor->s();
-                if (var_20 != pTSprite->sectnum)
+                if (headSect != pTSprite->sector())
                 {
-                    assert(validSectorIndex(var_20));
-                    ChangeActorSect(pTActor, var_20);
+                    assert(headSect);
+                    ChangeActorSect(pTActor, headSect);
                 }
 
                 pTSprite->x = MoveQX[nHd];
@@ -971,7 +971,7 @@ void AIQueenHead::Tick(RunListEvent* ev)
                     int x = pSprite->x;
                     int y = pSprite->y;
                     int z = pSprite->z;
-                    int nSector =pSprite->sectnum;
+                    auto pSector =pSprite->sector();
                     int nAngle = RandomSize(11) & kAngleMask;
 
                     pSprite->xrepeat = 127 - QueenHead.nIndex2;
@@ -990,7 +990,7 @@ void AIQueenHead::Tick(RunListEvent* ev)
                     BlowChunks(pActor);
                     BuildExplosion(pActor);
 
-                    ChangeActorSect(pActor, nSector);
+                    ChangeActorSect(pActor, pSector);
 
                     pSprite->x = x;
                     pSprite->y = y;
diff --git a/source/games/exhumed/src/set.cpp b/source/games/exhumed/src/set.cpp
index 961b8bb38..5b98c8de9 100644
--- a/source/games/exhumed/src/set.cpp
+++ b/source/games/exhumed/src/set.cpp
@@ -166,7 +166,7 @@ void AISoul::Tick(RunListEvent* ev)
         pSprite->x = pSetSprite->x;
         pSprite->y = pSetSprite->y;
         pSprite->z = pSetSprite->z - (GetActorHeight(pSet) >> 1);
-        ChangeActorSect(pActor, pSetSprite->sectnum);
+        ChangeActorSect(pActor, pSetSprite->sector());
         return;
     }
 }
diff --git a/source/games/exhumed/src/snake.cpp b/source/games/exhumed/src/snake.cpp
index bbf7303f9..5379f66a1 100644
--- a/source/games/exhumed/src/snake.cpp
+++ b/source/games/exhumed/src/snake.cpp
@@ -377,7 +377,7 @@ void AISnake::Tick(RunListEvent* ev)
         SnakeList[nSnake].nAngle = (SnakeList[nSnake].nAngle + 64) & 0x7FF;
 
         int var_28 = (nAngle + 512) & kAngleMask;
-        int nSector =pSprite->sectnum;
+        auto pSector = pSprite->sector();
 
         int x = pSprite->x;
         int y = pSprite->y;
@@ -393,7 +393,7 @@ void AISnake::Tick(RunListEvent* ev)
             pSprite2->y = y;
             pSprite2->z = z;
 
-            ChangeActorSect(pActor2, nSector);
+            ChangeActorSect(pActor2, pSector);
 
             int eax = (bsin(var_20) * SnakeList[nSnake].c[i]) >> 9;