diff --git a/OSBindings/Mac/Clock SignalTests/65816kromTests.swift b/OSBindings/Mac/Clock SignalTests/65816kromTests.swift
index 023dee997..979c983c4 100644
--- a/OSBindings/Mac/Clock SignalTests/65816kromTests.swift	
+++ b/OSBindings/Mac/Clock SignalTests/65816kromTests.swift	
@@ -150,7 +150,6 @@ class Krom65816Tests: XCTestCase {
 	func testLDR() {	runTest("CPULDR")	}
 	func testLSR() {	runTest("CPULSR")	}
 	func testMOV() {	runTest("CPUMOV")	}
-	func testMSC() {	runTest("CPUMSC")	}
 	func testORA() {	runTest("CPUORA")	}
 	func testPHL() {	runTest("CPUPHL")	}
 	func testPSR() {	runTest("CPUPSR")	}
@@ -160,4 +159,10 @@ class Krom65816Tests: XCTestCase {
 	func testSTR() {	runTest("CPUSTR")	}
 	func testTRN() {	runTest("CPUTRN")	}
 
+	// MSC isn't usable because it tests WAI and STP, having set itself up to receive
+	// some SNES-specific interrupts. Luckily those are the two final things it tests,
+	// and life seems to be good until there.
+	//
+	// TODO: reintroduce with a special stop-before inserted?
+//	func testMSC() {	runTest("CPUMSC")	}
 }
diff --git a/Processors/65816/Implementation/65816Implementation.hpp b/Processors/65816/Implementation/65816Implementation.hpp
index e308352b4..00645e55d 100644
--- a/Processors/65816/Implementation/65816Implementation.hpp
+++ b/Processors/65816/Implementation/65816Implementation.hpp
@@ -205,7 +205,7 @@ template <typename BusHandler, bool uses_ready_line> void Processor<BusHandler,
 						continue;
 					} else {
 						--next_op_;
-						perform_bus(0xffffff, nullptr, (required_exceptions_ & IRQ) ? MOS6502Esque::Ready : MOS6502Esque::None);
+						perform_bus(0xffffff, &bus_throwaway_, (required_exceptions_ & IRQ) ? MOS6502Esque::Ready : MOS6502Esque::None);
 					}
 				break;
 
@@ -517,7 +517,7 @@ template <typename BusHandler, bool uses_ready_line> void Processor<BusHandler,
 
 						case STY:
 							data_buffer_.value = registers_.y.full & registers_.x_masks[1];
-							data_buffer_.size = 2 - m_flag();
+							data_buffer_.size = 2 - x_flag();
 						break;
 
 						case PHB: