diff --git a/Core/APU.cpp b/Core/APU.cpp
index 7faa7461..ecd75a64 100644
--- a/Core/APU.cpp
+++ b/Core/APU.cpp
@@ -11,6 +11,8 @@ IAudioDevice* APU::AudioDevice = nullptr;
 
 APU::APU()
 {
+	APU::Instance = this;
+
 	blargg_err_t error = _buf.sample_rate(44100);
 	if(error) {
 		//report_error(error);
diff --git a/Core/Console.cpp b/Core/Console.cpp
index f8d44cd6..4cd42c99 100644
--- a/Core/Console.cpp
+++ b/Core/Console.cpp
@@ -98,7 +98,7 @@ bool Console::RunTest(uint8_t *expectedResult)
 	Timer timer;
 	uint8_t maxWait = 30;
 	while(true) {
-		_cpu->Exec();
+		_apu->Exec(_cpu->Exec());
 		_ppu->Exec();
 
 		if(timer.GetElapsedMS() > 100) {