diff --git a/Runtime/CObjectList.cpp b/Runtime/CObjectList.cpp
index 32126bccb..ba139dfd6 100644
--- a/Runtime/CObjectList.cpp
+++ b/Runtime/CObjectList.cpp
@@ -36,9 +36,9 @@ void CObjectList::RemoveObject(TUniqueId uid)
     }
     else
     {
+        x0_list[ent.prev].next = ent.next;
         if (ent.next != -1)
-            x0_list[ent.next].prev = -1;
-        x0_list[ent.prev].next = -1;
+            x0_list[ent.next].prev = ent.prev;
     }
     ent.entity = nullptr;
     ent.next = -1;
diff --git a/Runtime/CStateManager.cpp b/Runtime/CStateManager.cpp
index 3c967b132..d24d504bf 100644
--- a/Runtime/CStateManager.cpp
+++ b/Runtime/CStateManager.cpp
@@ -747,7 +747,7 @@ void CStateManager::DrawWorld() const
         bool isVisArea = area.x4_selfIdx == visAreaId;
         SetupFogForArea(area);
         g_Renderer->SetWorldLightFadeLevel(area.GetPostConstructed()->x1128_worldLightingLevel);
-        for (CEntity* ent : *area.GetPostConstructed()->x10c0_areaObjs)
+        for (CEntity* ent : *area.GetAreaObjects())
         {
             if (TCastToPtr<CActor> actor = ent)
             {
diff --git a/Runtime/Character/CFBStreamedCompression.cpp b/Runtime/Character/CFBStreamedCompression.cpp
index 99bdaded2..f7c9874ae 100644
--- a/Runtime/Character/CFBStreamedCompression.cpp
+++ b/Runtime/Character/CFBStreamedCompression.cpp
@@ -88,7 +88,6 @@ std::unique_ptr<u32[]> CFBStreamedCompression::GetRotationsAndOffsets(u32 words,
     u32 bsWords = ComputeBitstreamWords(chans);
 
     u32* bsPtr = reinterpret_cast<u32*>(bs);
-    size_t wordsz = bsPtr - ret.get();
     for (u32 w=0 ; w<bsWords ; ++w)
         bsPtr[w] = in.readUint32Big();
 
diff --git a/Runtime/Graphics/CBooRenderer.cpp b/Runtime/Graphics/CBooRenderer.cpp
index 0f330b32d..b9313c81d 100644
--- a/Runtime/Graphics/CBooRenderer.cpp
+++ b/Runtime/Graphics/CBooRenderer.cpp
@@ -186,12 +186,11 @@ void Buckets::Init()
     sMinMaxDistance[1] = skWorstMinMaxDistance[1];
 }
 
-CBooRenderer::CAreaListItem::CAreaListItem
-(const std::vector<CMetroidModelInstance>* geom,
- const CAreaRenderOctTree* octTree,
- std::vector<TCachedToken<CTexture>>&& textures,
- std::vector<CBooModel*>&& models, int areaIdx,
- const SShader* shaderSet)
+CBooRenderer::CAreaListItem::CAreaListItem(const std::vector<CMetroidModelInstance>* geom,
+                                           const CAreaRenderOctTree* octTree,
+                                           std::vector<TCachedToken<CTexture>>&& textures,
+                                           std::vector<CBooModel*>&& models, int areaIdx,
+                                           const SShader* shaderSet)
  : x0_geometry(geom), x4_octTree(octTree), x8_textures(std::move(textures)),
    x10_models(std::move(models)), x18_areaIdx(areaIdx), m_shaderSet(shaderSet) {}
 
diff --git a/Runtime/Particle/CElementGen.cpp b/Runtime/Particle/CElementGen.cpp
index 191964863..cae65f07d 100644
--- a/Runtime/Particle/CElementGen.cpp
+++ b/Runtime/Particle/CElementGen.cpp
@@ -1965,7 +1965,7 @@ bool CElementGen::IsSystemDeletable() const
 rstl::optional_object<zeus::CAABox> CElementGen::GetBounds() const
 {
     if (GetParticleCountAll() == 0)
-        return {zeus::CAABox()};
+        return {};
     else
         return {x2f0_systemBounds};
 }