diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl
index 1ff45b8de..4d8bf24fe 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl
@@ -891,11 +891,10 @@ OOVPA_NO_XREF(Direct3D_CheckDeviceMultiSampleType, 3911, 7)
         { 0x6E, 0x03 },
 OOVPA_END;
 
-
 // ******************************************************************
 // * D3DDevice_GetOverlayUpdateStatus
 // ******************************************************************
-OOVPA_NO_XREF(D3DDevice_GetOverlayUpdateStatus, 3911, 15) // Also for 4134, 4361, 4627, 5344, 5558, 5788, 5849
+OOVPA_NO_XREF(D3DDevice_GetOverlayUpdateStatus, 3911, 16) // Also for 4134, 4361, 4627, 5344, 5558, 5788, 5849
 
         { 0x00, 0xA1 },
 
@@ -912,12 +911,14 @@ OOVPA_NO_XREF(D3DDevice_GetOverlayUpdateStatus, 3911, 15) // Also for 4134, 4361
         { 0x12, 0x33 },
         { 0x13, 0xD2 },
         { 0x14, 0x3B },
-        { 0x15, 0xCE },
+//      { 0x15, 0xCE }, // F1 vs CE
+
         { 0x16, 0x0F },
         { 0x17, 0x95 },
         { 0x18, 0xC2 },
         { 0x19, 0x5E },
-
+        { 0x1A, 0x8B },
+        { 0x1B, 0xC2 },
         { 0x1C, 0xC3 },
 OOVPA_END;
 
@@ -1049,3 +1050,24 @@ OOVPA_XREF(D3DDevice_SetRenderState_CullMode, 3911, 2+15,
         { 0x4F, 0x04 },
         { 0x50, 0x04 },
 OOVPA_END;
+
+// ******************************************************************
+// * D3DDevice_RunPushBuffer
+// ******************************************************************
+OOVPA_NO_XREF(D3DDevice_RunPushBuffer, 3911, 12)
+
+        { 0x00, 0x83 },
+        { 0x05, 0x1D },
+
+        { 0x0A, 0x55 },
+        { 0x0B, 0x56 },
+        { 0x0C, 0x57 },
+        { 0x0D, 0x6A },
+        { 0x0E, 0x00 },
+        { 0x0F, 0x8B },
+        { 0x10, 0xCB },
+        { 0x11, 0xE8 },
+
+        { 0x1A, 0x83 },
+        { 0x23, 0x8B },
+OOVPA_END;
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl
index f373b8455..b54a6e9b5 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl
@@ -3601,6 +3601,7 @@ OOVPA_NO_XREF(D3DDevice_DeleteVertexShader, 3925, 6)
         { 0x17, 0x04 },
 OOVPA_END;
 
+#if 0 // No longer used, replaced by generic 3911 version
 // ******************************************************************
 // * D3DDevice_RunPushBuffer
 // ******************************************************************
@@ -3627,6 +3628,7 @@ OOVPA_NO_XREF(D3DDevice_RunPushBuffer, 3925, 15)
 		{ 0xF6, 0x04 },
 		{ 0xF7, 0x00 },
 OOVPA_END;
+#endif
 
 // ******************************************************************
 // * D3DDevice_BlockOnFence
@@ -4772,7 +4774,7 @@ OOVPATable D3D8_3925[] = {
 	REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH),
 	REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3925, PATCH),
 	REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, PATCH),
-	REGISTER_OOVPA(D3DDevice_RunPushBuffer, 3925, PATCH),
+	REGISTER_OOVPA(D3DDevice_RunPushBuffer, 3911, PATCH),
 	REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3925, PATCH),
 	REGISTER_OOVPA(D3DDevice_Reset, 3925, PATCH),
 	REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3925, DISABLED),
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl
index 365e96ff7..af841b74c 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl
@@ -229,7 +229,7 @@ OOVPATable D3D8_OOVPAV2[] = {
 	REGISTER_OOVPAS(D3DDevice_PrimeVertexCache, PATCH, 3925, 4134, 4361, 4627),
 	REGISTER_OOVPAS(D3DDevice_Release, PATCH, 3911),
 	REGISTER_OOVPAS(D3DDevice_Reset, PATCH, 3925, 4039),
-	REGISTER_OOVPAS(D3DDevice_RunPushBuffer, PATCH, 3925, 4039, 4627, 5120, 5558), // for 5455 (from 5558's comment)
+	REGISTER_OOVPAS(D3DDevice_RunPushBuffer, PATCH, 3911, 4039, 4627, 5120, 5558), // for 5455 (from 5558's comment)
 	REGISTER_OOVPAS(D3DDevice_RunVertexStateShader, PATCH, 3925, 4134),
 	REGISTER_OOVPAS(D3DDevice_SelectVertexShader, PATCH, 3925, 4039, 4627, 5344, 5455),
 	REGISTER_OOVPAS(D3DDevice_SelectVertexShaderDirect, PATCH, 4361),