diff --git a/Source/Core/Editing/UndoManager.cs b/Source/Core/Editing/UndoManager.cs
index 29c5fd3497488cc42f3f3d93bb546b7b9fa66671..c6db79e8b6464b087ef3cf23231129ac9d59c335 100644
--- a/Source/Core/Editing/UndoManager.cs
+++ b/Source/Core/Editing/UndoManager.cs
@@ -349,7 +349,7 @@ namespace CodeImp.DoomBuilder.Editing
 		private void LogRecordInfo(string info)
 		{
 			#if DEBUG
-				General.WriteLogLine(info);
+				//General.WriteLogLine(info);
 			#endif
 		}
 
diff --git a/Source/Core/Rendering/SurfaceManager.cs b/Source/Core/Rendering/SurfaceManager.cs
index 941476cdf3a46e50c7c502d1b72d329f90af6211..f1b130fa2e24e26631a7a1fcaef1c83228a5b904 100644
--- a/Source/Core/Rendering/SurfaceManager.cs
+++ b/Source/Core/Rendering/SurfaceManager.cs
@@ -263,6 +263,10 @@ namespace CodeImp.DoomBuilder.Rendering
 			int verticesperentry = set.numvertices * 2;
 			int maxentriesperbuffer = MAX_VERTICES_PER_BUFFER / verticesperentry;
 
+			// Make a new bufer when the last one is full
+			if((bufferindex > -1) && (set.buffersizes[bufferindex] >= (maxentriesperbuffer * verticesperentry)))
+				bufferindex = -1;
+			
 			while(addentries > 0)
 			{
 				// Create a new buffer?