diff --git a/src/rendering/hwrenderer/doom_levelsubmesh.cpp b/src/rendering/hwrenderer/doom_levelsubmesh.cpp
index f61742e1a..3475233e1 100644
--- a/src/rendering/hwrenderer/doom_levelsubmesh.cpp
+++ b/src/rendering/hwrenderer/doom_levelsubmesh.cpp
@@ -7,6 +7,7 @@
 #include "c_dispatch.h"
 #include "g_levellocals.h"
 #include "a_dynlight.h"
+#include "halffloat.h"
 #include "hw_renderstate.h"
 #include "hw_vertexbuilder.h"
 #include "hwrenderer/scene/hw_drawstructs.h"
@@ -252,10 +253,11 @@ void DoomLevelSubmesh::CreateStaticSurfaces(FLevelLocals& doomMap)
 				surf.PipelineID = pipelineID;
 				surf.PortalIndex = LevelMesh->sectorPortals[flatpart.ceiling][i];
 
-				auto plane = sector->GetSecPlane(flatpart.ceiling);
+				auto plane = surf.ControlSector ? surf.ControlSector->GetSecPlane(!flatpart.ceiling) : sector->GetSecPlane(flatpart.ceiling);
 				surf.Plane = FVector4((float)plane.Normal().X, (float)plane.Normal().Y, (float)plane.Normal().Z, -(float)plane.D);
-				//if (flatpart.ceiling)
-				//	surf.Plane = -surf.Plane;
+
+				if (surf.ControlSector)
+					surf.Plane = -surf.Plane;
 
 				for (subsector_t* sub : section.subsectors)
 				{
@@ -283,9 +285,6 @@ void DoomLevelSubmesh::CreateStaticSurfaces(FLevelLocals& doomMap)
 					surf.Subsector = sub;
 					surf.MeshLocation.StartVertIndex = startVertIndex;
 					surf.MeshLocation.NumVerts = sub->numlines;
-
-					//surf.Plane = ToPlane(Mesh.Vertices[startVertIndex + 2].fPos(), Mesh.Vertices[startVertIndex + 1].fPos(), Mesh.Vertices[startVertIndex].fPos());
-
 					Surfaces.Push(surf);
 				}
 			}
@@ -533,6 +532,47 @@ void DoomLevelSubmesh::PackLightmapAtlas(int lightmapStartIndex)
 	}
 
 	LMTextureCount = (int)packer.getNumPages();
+
+#if 0 // Debug atlas tile locations:
+	uint16_t colors[30] =
+	{
+		floatToHalf(1.0f), floatToHalf(0.0f), floatToHalf(0.0f),
+		floatToHalf(0.0f), floatToHalf(1.0f), floatToHalf(0.0f),
+		floatToHalf(1.0f), floatToHalf(1.0f), floatToHalf(0.0f),
+		floatToHalf(0.0f), floatToHalf(1.0f), floatToHalf(1.0f),
+		floatToHalf(1.0f), floatToHalf(0.0f), floatToHalf(1.0f),
+		floatToHalf(0.5f), floatToHalf(0.0f), floatToHalf(0.0f),
+		floatToHalf(0.0f), floatToHalf(0.5f), floatToHalf(0.0f),
+		floatToHalf(0.5f), floatToHalf(0.5f), floatToHalf(0.0f),
+		floatToHalf(0.0f), floatToHalf(0.5f), floatToHalf(0.5f),
+		floatToHalf(0.5f), floatToHalf(0.0f), floatToHalf(0.5f)
+	};
+	LMTextureData.Resize(LMTextureSize * LMTextureSize * LMTextureCount * 3);
+	uint16_t* pixels = LMTextureData.Data();
+	for (DoomLevelMeshSurface& surf : Surfaces)
+	{
+		surf.AlwaysUpdate = false;
+		surf.NeedsUpdate = false;
+
+		int index = surf.Side ? surf.Side->Index() : (surf.Subsector && surf.Subsector->sector ? surf.Subsector->sector->Index() : 0);
+		uint16_t* color = colors + (index % 10) * 3;
+
+		int x = surf.AtlasTile.X;
+		int y = surf.AtlasTile.Y;
+		int w = surf.AtlasTile.Width;
+		int h = surf.AtlasTile.Height;
+		for (int yy = y; yy < y + h; yy++)
+		{
+			uint16_t* line = pixels + surf.AtlasTile.ArrayIndex * LMTextureSize * LMTextureSize + yy * LMTextureSize * 3;
+			for (int xx = x; xx < x + w; xx++)
+			{
+				line[xx * 3] = color[0];
+				line[xx * 3 + 1] = color[1];
+				line[xx * 3 + 2] = color[2];
+			}
+		}
+	}
+#endif
 }
 
 BBox DoomLevelSubmesh::GetBoundsFromSurface(const LevelMeshSurface& surface) const
diff --git a/src/rendering/hwrenderer/hw_vertexbuilder.cpp b/src/rendering/hwrenderer/hw_vertexbuilder.cpp
index edca6e113..bf4490880 100644
--- a/src/rendering/hwrenderer/hw_vertexbuilder.cpp
+++ b/src/rendering/hwrenderer/hw_vertexbuilder.cpp
@@ -247,9 +247,9 @@ static int CreateIndexedSectorVerticesLM(FRenderState& renderstate, sector_t* se
 			if (lightmap && lightmap->Type != ST_NONE) // surface may be missing if the subsector is degenerate triangle
 			{
 				FFlatVertex* luvs = &lightmap->Submesh->Mesh.Vertices[lightmap->MeshLocation.StartVertIndex];
-				for (unsigned int j = 0; j < sub->numlines; j++)
+				for (unsigned int j = 0, end = sub->numlines; j < end; j++)
 				{
-					SetFlatVertex(vbo_shadowdata[vi + pos], sub->firstline[j].v1, plane, luvs[j].lu, luvs[j].lv, luvs[j].lindex);
+					SetFlatVertex(vbo_shadowdata[vi + pos], sub->firstline[j].v1, plane, luvs[end - 1 - j].lu, luvs[end - 1 - j].lv, luvs[end - 1 - j].lindex);
 					vbo_shadowdata[vi + pos].z += diff;
 					pos++;
 				}
diff --git a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp b/src/rendering/hwrenderer/scene/hw_drawinfo.cpp
index 78e6557d9..0fcf18725 100644
--- a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp
+++ b/src/rendering/hwrenderer/scene/hw_drawinfo.cpp
@@ -532,6 +532,11 @@ void HWDrawInfo::PutWallPortal(HWWall wall, FRenderState& state)
 			return;
 		wall.planemirror = (portalplane == sector_t::ceiling) ? &wall.frontsector->ceilingplane : &wall.frontsector->floorplane;
 	}
+	else if (portaltype == PORTALTYPE_SKYBOX || portaltype == PORTALTYPE_MIRROR || portaltype == PORTALTYPE_LINETOLINE)
+	{
+		// To do: add support for these
+		return;
+	}
 	wall.PutPortal(&ddi, state, portaltype, portalplane);
 }