diff --git a/OpenRA.Game/Graphics/SheetBuilder.cs b/OpenRA.Game/Graphics/SheetBuilder.cs
index c935e9bab9..6c076068dc 100644
--- a/OpenRA.Game/Graphics/SheetBuilder.cs
+++ b/OpenRA.Game/Graphics/SheetBuilder.cs
@@ -22,10 +22,12 @@ namespace OpenRA.Graphics
 			: base(message) { }
 	}
 
+	// The enum values indicate the number of channels used by the type
+	// They are not arbitrary IDs!
 	public enum SheetType
 	{
 		Indexed = 1,
-		BGRA = 2,
+		BGRA = 4,
 	}
 
 	public sealed class SheetBuilder : IDisposable
diff --git a/OpenRA.Game/Graphics/WorldRenderer.cs b/OpenRA.Game/Graphics/WorldRenderer.cs
index ed9b1dd7f5..273016e3c8 100644
--- a/OpenRA.Game/Graphics/WorldRenderer.cs
+++ b/OpenRA.Game/Graphics/WorldRenderer.cs
@@ -185,7 +185,8 @@ namespace OpenRA.Graphics
 				.Concat(aboveShroudSelected)
 				.Concat(aboveShroudEffects)
 				.Concat(aboveShroudOrderGenerator)
-				.Select(r => r.PrepareRender(this));
+				.Select(r => r.PrepareRender(this))
+				.ToList();
 			Game.Renderer.WorldVoxelRenderer.EndFrame();
 
 			// HACK: Keep old grouping behaviour