diff --git a/src/r_compiler/llvmdrawers.h b/src/r_compiler/llvmdrawers.h
index 64d73eeee..e7386678e 100644
--- a/src/r_compiler/llvmdrawers.h
+++ b/src/r_compiler/llvmdrawers.h
@@ -45,7 +45,7 @@ struct DrawWallArgs
 	FString ToString()
 	{
 		FString info;
-		info.Format("dest_y = %i, count = %i, flags = %i", dest_y, count, flags);
+		info.Format("dest_y = %i, count = %i, flags = %i, texturefrac[0] = %u, textureheight[0] = %u", dest_y, count, flags, texturefrac[0], textureheight[0]);
 		return info;
 	}
 };
@@ -128,7 +128,7 @@ struct DrawColumnArgs
 	FString ToString()
 	{
 		FString info;
-		info.Format("dest_y = %i, count = %i, flags = %i", dest_y, count, flags);
+		info.Format("dest_y = %i, count = %i, flags = %i, iscale = %i (%f), texturefrac = %i (%f)", dest_y, count, flags, iscale, ((fixed_t)iscale) / (float)FRACUNIT, texturefrac, ((fixed_t)texturefrac) / (float)FRACUNIT);
 		return info;
 	}
 };
diff --git a/src/r_draw_rgba.cpp b/src/r_draw_rgba.cpp
index 2b9eb86e7..1b46489a5 100644
--- a/src/r_draw_rgba.cpp
+++ b/src/r_draw_rgba.cpp
@@ -107,7 +107,7 @@ public:
 
 	FString DebugInfo() override
 	{
-		return "DrawSpanLLVMCommand\n" + args.ToString();
+		return "DrawSpan\n" + args.ToString();
 	}
 
 protected:
@@ -258,7 +258,7 @@ public:
 
 	FString DebugInfo() override
 	{
-		return "DrawWall4LLVMCommand\n" + args.ToString();
+		return "DrawWall4\n" + args.ToString();
 	}
 };
 
@@ -319,7 +319,7 @@ public:
 
 	FString DebugInfo() override
 	{
-		return "DrawWall1LLVMCommand\n" + args.ToString();
+		return "DrawWall1\n" + args.ToString();
 	}
 };
 
@@ -340,7 +340,7 @@ protected:
 
 	FString DebugInfo() override
 	{
-		return "DrawColumnLLVMCommand\n" + args.ToString();
+		return "DrawColumn\n" + args.ToString();
 	}
 
 public:
@@ -423,7 +423,7 @@ public:
 
 	FString DebugInfo() override
 	{
-		return "DrawSkyLLVMCommand\n" + args.ToString();
+		return "DrawSky\n" + args.ToString();
 	}
 };
 
@@ -587,7 +587,7 @@ public:
 
 	FString DebugInfo() override
 	{
-		return "DrawFuzzColumnRGBACommand";
+		return "DrawFuzzColumn";
 	}
 };
 
@@ -626,7 +626,7 @@ public:
 
 	FString DebugInfo() override
 	{
-		return "FillSpanRGBACommand";
+		return "FillSpan";
 	}
 };
 
@@ -750,7 +750,7 @@ public:
 
 	FString DebugInfo() override
 	{
-		return "DrawSlabRGBACommand";
+		return "DrawSlab";
 	}
 };
 
@@ -829,7 +829,7 @@ public:
 
 	FString DebugInfo() override
 	{
-		return "DrawFogBoundaryLineRGBACommand";
+		return "DrawFogBoundaryLine";
 	}
 };
 
@@ -983,7 +983,7 @@ public:
 
 	FString DebugInfo() override
 	{
-		return "DrawTiltedSpanRGBACommand";
+		return "DrawTiltedSpan";
 	}
 };
 
@@ -1027,7 +1027,7 @@ public:
 
 	FString DebugInfo() override
 	{
-		return "DrawColoredSpanRGBACommand";
+		return "DrawColoredSpan";
 	}
 };
 
@@ -1099,7 +1099,7 @@ public:
 
 	FString DebugInfo() override
 	{
-		return "FillTransColumnRGBACommand";
+		return "FillTransColumn";
 	}
 };
 
@@ -1279,7 +1279,7 @@ public:
 
 	FString DebugInfo() override
 	{
-		return "DrawTrianglesCommand";
+		return "DrawTriangles";
 	}
 
 private:
diff --git a/src/r_drawt_rgba.cpp b/src/r_drawt_rgba.cpp
index 0a213418b..2963d2fc1 100644
--- a/src/r_drawt_rgba.cpp
+++ b/src/r_drawt_rgba.cpp
@@ -109,7 +109,7 @@ public:
 
 	FString DebugInfo() override
 	{
-		return "DrawColumnRt1LLVMCommand\n" + args.ToString();
+		return "DrawColumnRt\n" + args.ToString();
 	}
 };
 
@@ -168,7 +168,7 @@ public:
 
 	FString DebugInfo() override
 	{
-		return "RtInitColsRGBACommand";
+		return "RtInitCols";
 	}
 };
 
@@ -248,7 +248,7 @@ public:
 
 	FString DebugInfo() override
 	{
-		return "DrawColumnHorizRGBACommand";
+		return "DrawColumnHoriz";
 	}
 };
 
@@ -298,7 +298,7 @@ public:
 
 	FString DebugInfo() override
 	{
-		return "FillColumnHorizRGBACommand";
+		return "FillColumnHoriz";
 	}
 };