diff --git a/src/System/Gr/GrScreen.ZC b/src/System/Gr/GrScreen.ZC
index dcfd93a9..d3166177 100755
--- a/src/System/Gr/GrScreen.ZC
+++ b/src/System/Gr/GrScreen.ZC
@@ -395,10 +395,16 @@ U0 GrUpdateScreen32()
 	while (src < size) //draw 2 pixels at a time
 		*dst++ = gr_palette[*src++ & 0xFF] | gr_palette[*src++ & 0xFF] << 32;
 
-	GrCalcScreenUpdates;
-
 	if (LBtr(&sys_semas[SEMA_FLUSH_VBE_IMAGE], 0))
+	{
 		MemCopy(text.fb_alias, text.raw_screen, text.buffer_size);
+		src -= GR_WIDTH * GR_HEIGHT; // Reset src ptr
+		MemCopy(gr.screen_cache, src, GR_WIDTH * GR_HEIGHT);
+	}
+	else
+	{
+		GrCalcScreenUpdates;
+	}
 }
 
 U0 GrUpdateScreen()
diff --git a/src/System/Utils/ConversionScript.ZC b/src/System/Utils/ConversionScript.ZC
index e3436b86..8289fea9 100755
--- a/src/System/Utils/ConversionScript.ZC
+++ b/src/System/Utils/ConversionScript.ZC
@@ -41,7 +41,7 @@ U0 Cvt(U8 *ff_mask="*", U8 *fu_flags="+r+l-i+S")
 	Find("ExtDft",			ff_mask, fu_flags, "ExtDefault");
 	Find("ExtChg",			ff_mask, fu_flags, "ExtChange");
 	Find("RegDft",			ff_mask, fu_flags, "RegDefault");
-	Find("\"HC\"",			ff_mask, fu_flags, "\"CC\"");
+	Find("\"HC\"",			ff_mask, fu_flags, "\"ZC\"");
 	Find("CDrv",			ff_mask, fu_flags, "CDrive");
 	Find("CDbgInfo",		ff_mask, fu_flags, "CDebugInfo");
 	Find("dbg_info",		ff_mask, fu_flags, "debug_info");