diff --git a/src/gl/data/gl_vertexbuffer.cpp b/src/gl/data/gl_vertexbuffer.cpp
index b18b367c37..4e76b51cb3 100644
--- a/src/gl/data/gl_vertexbuffer.cpp
+++ b/src/gl/data/gl_vertexbuffer.cpp
@@ -221,7 +221,7 @@ void FFlatVertexBuffer::OutputResized(int width, int height)
 	vbo_shadowdata[7].Set((float)width, (float)height, 0, 0, 0);
 	
 	Map();
-	memcpy(map, &vbo_shadowdata[4], 4 * sizeof(FFlatVertex));
+	memcpy(&map[4], &vbo_shadowdata[4], 4 * sizeof(FFlatVertex));
 	Unmap();
 }
 
diff --git a/src/gl/system/gl_framebuffer.cpp b/src/gl/system/gl_framebuffer.cpp
index 08aca521fd..6264352f6c 100644
--- a/src/gl/system/gl_framebuffer.cpp
+++ b/src/gl/system/gl_framebuffer.cpp
@@ -189,7 +189,9 @@ void OpenGLFrameBuffer::Update()
 		int clientHeight = GetClientHeight();
 		if (clientWidth > 0 && clientHeight > 0 && (Width != clientWidth || Height != clientHeight))
 		{
-			Resize(clientWidth, clientHeight);
+			// Do not call Resize here because it's only for software canvases
+			Pitch = Width = clientWidth;
+			Height = clientHeight;
 			V_OutputResized(Width, Height);
 			GLRenderer->mVBO->OutputResized(Width, Height);
 		}
diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index fefe5cd8f8..1b52f5a931 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -754,7 +754,7 @@ void ACSStringPool::ReadStrings(FSerializer &file, const char *key)
 						unsigned bucketnum = h % NUM_BUCKETS;
 						Pool[ii].Hash = h;
 						Pool[ii].Next = PoolBuckets[bucketnum];
-						PoolBuckets[bucketnum] = i;
+						PoolBuckets[bucketnum] = ii;
 					}
 					file.EndObject();
 				}
diff --git a/src/p_floor.cpp b/src/p_floor.cpp
index 8d09ea2d52..62479e3404 100644
--- a/src/p_floor.cpp
+++ b/src/p_floor.cpp
@@ -342,7 +342,7 @@ bool P_CreateFloor(sector_t *sec, DFloor::EFloor floortype, line_t *line,
 		ceilingheight = sec->FindLowestCeilingPoint(&spot2);
 		floor->m_FloorDestDist = sec->floorplane.PointToDist(spot, newheight);
 		if (sec->floorplane.ZatPointDist(spot2, floor->m_FloorDestDist) > ceilingheight)
-			floor->m_FloorDestDist = sec->floorplane.PointToDist(spot2,	floortype == ceilingheight - height);
+			floor->m_FloorDestDist = sec->floorplane.PointToDist(spot2,	ceilingheight - height);
 		break;
 
 	case DFloor::floorRaiseToHighest: