diff --git a/src/include/86box/nv/classes/vid_nv3_classes.h b/src/include/86box/nv/classes/vid_nv3_classes.h
index b4f41fc30..c5c014245 100644
--- a/src/include/86box/nv/classes/vid_nv3_classes.h
+++ b/src/include/86box/nv/classes/vid_nv3_classes.h
@@ -79,6 +79,8 @@ typedef enum nv3_pgraph_class_e
 
 #define NV3_ROP_SET_ROP                                 0x0300  // Set GDI standard rop
 
+#define NV3_BETA_FACTOR                                 0x0300
+
 #define NV3_CLIP_POSITION                               0x0300  // S16:S16, 0=topleft
 #define NV3_CLIP_SIZE                                   0x0304  // U16:U16
 
diff --git a/src/include/86box/nv/vid_nv3.h b/src/include/86box/nv/vid_nv3.h
index c1d0e3bdd..d7d7dc144 100644
--- a/src/include/86box/nv/vid_nv3.h
+++ b/src/include/86box/nv/vid_nv3.h
@@ -210,6 +210,8 @@ extern const device_config_t nv3_config[];
 #define NV3_PBUS_END                                    0x1FFF
 #define NV3_PFIFO_START                                 0x2000      // FIFO for DMA Object Submission (uses hashtable to store the objects)
 
+#define NV3_PFIFO_MINIMUM_GUARANTEED_DEPTH                             0x7C
+
 #define NV3_PFIFO_DELAY_0                               0x2040      // PFIFO Config Register
 #define NV3_PFIFO_DEBUG_0                               0x2080      // PFIFO Debug Register
 #define NV3_PFIFO_CACHE0_ERROR_PENDING                  0
@@ -286,7 +288,7 @@ extern const device_config_t nv3_config[];
 #define NV3_PFIFO_CACHE0_METHOD_END                     0x3200
 #define NV3_PFIFO_CACHE0_METHOD_ADDRESS                 2           // 12:2
 #define NV3_PFIFO_CACHE0_METHOD_SUBCHANNEL              13          // 15:13
-#define NV3_PFIFO_CACHE1_PUSH0                      0x3200
+#define NV3_PFIFO_CACHE1_PUSH0                          0x3200
 #define NV3_PFIFO_CACHE1_PUSH_CHANNEL_ID                0x3204
 #define NV3_PFIFO_CACHE1_PUT                            0x3210
 #define NV3_PFIFO_CACHE1_PUT_ADDRESS                    2           // 6:2
@@ -527,7 +529,7 @@ extern const device_config_t nv3_config[];
 #define NV3_PGRAPH_INTR_0_SOFTWARE_NOTIFY               28          // Fired on software notification
 
 #define NV3_PGRAPH_INTR_1                               0x400104
-#define NV3_PGRAPH_INTR_1_INVALID_METHOD                0           // Invalid method
+#define NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING       0           // Software or invalid method
 #define NV3_PGRAPH_INTR_1_INVALID_DATA                  4           // Invalid data. Not sure when this would be triggered.
 #define NV3_PGRAPH_INTR_1_DOUBLE_NOTIFY                 12          // Tried to notify while a notify was pending.
 #define NV3_PGRAPH_INTR_1_CTXSW_NOTIFY                  16          // Notify fired for software context
diff --git a/src/video/nv/nv3/classes/nv3_class_001_beta_factor.c b/src/video/nv/nv3/classes/nv3_class_001_beta_factor.c
index 2acf3a8f4..784da2eb0 100644
--- a/src/video/nv/nv3/classes/nv3_class_001_beta_factor.c
+++ b/src/video/nv/nv3/classes/nv3_class_001_beta_factor.c
@@ -34,7 +34,7 @@ void nv3_class_001_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_002_rop.c b/src/video/nv/nv3/classes/nv3_class_002_rop.c
index 9286c180c..38fe29d78 100644
--- a/src/video/nv/nv3/classes/nv3_class_002_rop.c
+++ b/src/video/nv/nv3/classes/nv3_class_002_rop.c
@@ -37,7 +37,7 @@ void nv3_class_002_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
             break;  
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_003_chroma_key.c b/src/video/nv/nv3/classes/nv3_class_003_chroma_key.c
index 06750521e..92a3cb225 100644
--- a/src/video/nv/nv3/classes/nv3_class_003_chroma_key.c
+++ b/src/video/nv/nv3/classes/nv3_class_003_chroma_key.c
@@ -34,7 +34,7 @@ void nv3_class_003_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_004_plane_mask.c b/src/video/nv/nv3/classes/nv3_class_004_plane_mask.c
index 10788b5ce..9c9bced95 100644
--- a/src/video/nv/nv3/classes/nv3_class_004_plane_mask.c
+++ b/src/video/nv/nv3/classes/nv3_class_004_plane_mask.c
@@ -34,7 +34,7 @@ void nv3_class_004_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_005_clipping_rectangle.c b/src/video/nv/nv3/classes/nv3_class_005_clipping_rectangle.c
index 8ba698aa5..10136feac 100644
--- a/src/video/nv/nv3/classes/nv3_class_005_clipping_rectangle.c
+++ b/src/video/nv/nv3/classes/nv3_class_005_clipping_rectangle.c
@@ -43,7 +43,7 @@ void nv3_class_005_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
             break;
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_006_pattern.c b/src/video/nv/nv3/classes/nv3_class_006_pattern.c
index ee3348669..2c2174447 100644
--- a/src/video/nv/nv3/classes/nv3_class_006_pattern.c
+++ b/src/video/nv/nv3/classes/nv3_class_006_pattern.c
@@ -34,7 +34,7 @@ void nv3_class_006_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_007_rectangle.c b/src/video/nv/nv3/classes/nv3_class_007_rectangle.c
index dd82030ca..f0e85f4db 100644
--- a/src/video/nv/nv3/classes/nv3_class_007_rectangle.c
+++ b/src/video/nv/nv3/classes/nv3_class_007_rectangle.c
@@ -63,7 +63,7 @@ void nv3_class_007_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
             }
 
             nv_log("%s: Invalid or Unimplemented method 0x%04x\n", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_008_point.c b/src/video/nv/nv3/classes/nv3_class_008_point.c
index 8647b27cb..4ffffba92 100644
--- a/src/video/nv/nv3/classes/nv3_class_008_point.c
+++ b/src/video/nv/nv3/classes/nv3_class_008_point.c
@@ -34,7 +34,7 @@ void nv3_class_008_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_009_line.c b/src/video/nv/nv3/classes/nv3_class_009_line.c
index dddbf5719..edb432884 100644
--- a/src/video/nv/nv3/classes/nv3_class_009_line.c
+++ b/src/video/nv/nv3/classes/nv3_class_009_line.c
@@ -34,7 +34,7 @@ void nv3_class_009_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_00a_lin.c b/src/video/nv/nv3/classes/nv3_class_00a_lin.c
index 45f1c97b9..fc7dcc879 100644
--- a/src/video/nv/nv3/classes/nv3_class_00a_lin.c
+++ b/src/video/nv/nv3/classes/nv3_class_00a_lin.c
@@ -35,7 +35,7 @@ void nv3_class_00a_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_00b_triangle.c b/src/video/nv/nv3/classes/nv3_class_00b_triangle.c
index e3bbf9f07..08a205ac2 100644
--- a/src/video/nv/nv3/classes/nv3_class_00b_triangle.c
+++ b/src/video/nv/nv3/classes/nv3_class_00b_triangle.c
@@ -34,7 +34,7 @@ void nv3_class_00b_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_00c_win95_gdi_text.c b/src/video/nv/nv3/classes/nv3_class_00c_win95_gdi_text.c
index 66eddee71..2b14ec2ff 100644
--- a/src/video/nv/nv3/classes/nv3_class_00c_win95_gdi_text.c
+++ b/src/video/nv/nv3/classes/nv3_class_00c_win95_gdi_text.c
@@ -34,7 +34,7 @@ void nv3_class_00c_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_00d_m2mf.c b/src/video/nv/nv3/classes/nv3_class_00d_m2mf.c
index 687e1e763..fa1f08811 100644
--- a/src/video/nv/nv3/classes/nv3_class_00d_m2mf.c
+++ b/src/video/nv/nv3/classes/nv3_class_00d_m2mf.c
@@ -34,7 +34,7 @@ void nv3_class_00d_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_00e_scaled_image_from_mem.c b/src/video/nv/nv3/classes/nv3_class_00e_scaled_image_from_mem.c
index f4bc8d6ee..c4b68c34f 100644
--- a/src/video/nv/nv3/classes/nv3_class_00e_scaled_image_from_mem.c
+++ b/src/video/nv/nv3/classes/nv3_class_00e_scaled_image_from_mem.c
@@ -34,7 +34,7 @@ void nv3_class_00e_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_010_blit.c b/src/video/nv/nv3/classes/nv3_class_010_blit.c
index c502bdd28..3ff52f68a 100644
--- a/src/video/nv/nv3/classes/nv3_class_010_blit.c
+++ b/src/video/nv/nv3/classes/nv3_class_010_blit.c
@@ -34,7 +34,7 @@ void nv3_class_010_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_011_image.c b/src/video/nv/nv3/classes/nv3_class_011_image.c
index 36679cb7f..b40b9025c 100644
--- a/src/video/nv/nv3/classes/nv3_class_011_image.c
+++ b/src/video/nv/nv3/classes/nv3_class_011_image.c
@@ -34,7 +34,7 @@ void nv3_class_011_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_012_bitmap.c b/src/video/nv/nv3/classes/nv3_class_012_bitmap.c
index 2ce3fb685..bbbb6997d 100644
--- a/src/video/nv/nv3/classes/nv3_class_012_bitmap.c
+++ b/src/video/nv/nv3/classes/nv3_class_012_bitmap.c
@@ -35,7 +35,7 @@ void nv3_class_012_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_014_transfer2memory.c b/src/video/nv/nv3/classes/nv3_class_014_transfer2memory.c
index 86be6a74a..47e4b0c32 100644
--- a/src/video/nv/nv3/classes/nv3_class_014_transfer2memory.c
+++ b/src/video/nv/nv3/classes/nv3_class_014_transfer2memory.c
@@ -35,7 +35,7 @@ void nv3_class_014_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_015_stretched_image_from_cpu.c b/src/video/nv/nv3/classes/nv3_class_015_stretched_image_from_cpu.c
index 5b499b73d..f1c571943 100644
--- a/src/video/nv/nv3/classes/nv3_class_015_stretched_image_from_cpu.c
+++ b/src/video/nv/nv3/classes/nv3_class_015_stretched_image_from_cpu.c
@@ -34,7 +34,7 @@ void nv3_class_015_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_017_d3d5_tri_zeta_buffer.c b/src/video/nv/nv3/classes/nv3_class_017_d3d5_tri_zeta_buffer.c
index 4f1e73774..838c64aa7 100644
--- a/src/video/nv/nv3/classes/nv3_class_017_d3d5_tri_zeta_buffer.c
+++ b/src/video/nv/nv3/classes/nv3_class_017_d3d5_tri_zeta_buffer.c
@@ -34,7 +34,7 @@ void nv3_class_017_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_018_point_zeta_buffer.c b/src/video/nv/nv3/classes/nv3_class_018_point_zeta_buffer.c
index 4829fafb9..904cac757 100644
--- a/src/video/nv/nv3/classes/nv3_class_018_point_zeta_buffer.c
+++ b/src/video/nv/nv3/classes/nv3_class_018_point_zeta_buffer.c
@@ -36,7 +36,7 @@ void nv3_class_018_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
     {
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_01c_image_in_memory.c b/src/video/nv/nv3/classes/nv3_class_01c_image_in_memory.c
index d55ee9511..9ba86c0eb 100644
--- a/src/video/nv/nv3/classes/nv3_class_01c_image_in_memory.c
+++ b/src/video/nv/nv3/classes/nv3_class_01c_image_in_memory.c
@@ -64,6 +64,10 @@ void nv3_class_01c_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
             nv_log("Image in Memory BUF%d COLOR_FORMAT=0x%04x", src_buffer_id, param);
 
             break;
+        /* DOn't log invalid */
+        case NV3_IMAGE_IN_MEMORY_IN_MEMORY_DMA_CTX_TYPE:
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
+            break; 
         /* Pitch - length between scanlines */
         case NV3_IMAGE_IN_MEMORY_PITCH:
 
@@ -80,7 +84,7 @@ void nv3_class_01c_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
             break;
         default:
             nv_log("%s: Invalid or Unimplemented method 0x%04x", nv3_class_names[context.class_id & 0x1F], method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
\ No newline at end of file
diff --git a/src/video/nv/nv3/classes/nv3_class_shared_methods.c b/src/video/nv/nv3/classes/nv3_class_shared_methods.c
index 38d45f70e..7338c45ad 100644
--- a/src/video/nv/nv3/classes/nv3_class_shared_methods.c
+++ b/src/video/nv/nv3/classes/nv3_class_shared_methods.c
@@ -56,7 +56,7 @@ void nv3_generic_method(uint32_t param, uint32_t method_id, nv3_ramin_context_t
             break;
         default:
             nv_log("Shared Generic Methods: Invalid or Unimplemented method 0x%04x", method_id);
-            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_INVALID_METHOD);
+            nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);
             return;
     }
 }
diff --git a/src/video/nv/nv3/subsystems/nv3_pgraph.c b/src/video/nv/nv3/subsystems/nv3_pgraph.c
index 93fe8c32f..eddf61dea 100644
--- a/src/video/nv/nv3/subsystems/nv3_pgraph.c
+++ b/src/video/nv/nv3/subsystems/nv3_pgraph.c
@@ -602,8 +602,6 @@ void nv3_pgraph_arbitrate_method(uint32_t param, uint16_t method, uint8_t channe
         }
     }
 
-    
-
     nv3_notify_if_needed(param, method, context, grobj);
 }