diff --git a/uppsrc/Painter/Context.cpp b/uppsrc/Painter/Context.cpp
index 243bd2bca..c5d542270 100644
--- a/uppsrc/Painter/Context.cpp
+++ b/uppsrc/Painter/Context.cpp
@@ -167,6 +167,8 @@ void BufferPainter::Create(ImageBuffer& ib, int mode_)
 		size = ib.GetSize();
 
 		co_subpixel.Clear();
+		co_span.Clear();
+		span.Clear();
 	}
 
 	SyncCo();
diff --git a/uppsrc/Painter/Rasterizer.cpp b/uppsrc/Painter/Rasterizer.cpp
index a85a8de4a..66e2f3193 100644
--- a/uppsrc/Painter/Rasterizer.cpp
+++ b/uppsrc/Painter/Rasterizer.cpp
@@ -41,7 +41,7 @@ void Rasterizer::Create(int cx, int cy, bool subpixel)
 
 	cliprect = Sizef(sz);
 	Init();
-	Reset();
+	Reset(); // TODO: Can be removed (cell is just constructed, Init called above)
 }
 
 void Rasterizer::Free()