diff --git a/Source/Core/DSPCore/Src/assemble.cpp b/Source/Core/DSPCore/Src/assemble.cpp
index 5521438cb8..28615a9487 100644
--- a/Source/Core/DSPCore/Src/assemble.cpp
+++ b/Source/Core/DSPCore/Src/assemble.cpp
@@ -112,6 +112,7 @@ bool DSPAssembler::Assemble(const char *text, std::vector<u16> *code, std::vecto
 
 	last_error_str = "(no errors)";
 	last_error = ERR_OK;
+
 	return true;
 }
 
@@ -742,7 +743,7 @@ bool DSPAssembler::AssembleFile(const char *fname, int pass)
 
 	fseek(fsrc, 0, SEEK_SET);
 
-	printf("Pass %d\n", pass);
+	printf("%s: Pass %d\n", fname, pass);
 	code_line = 0;
 	m_cur_pass = pass;
 
@@ -765,7 +766,7 @@ bool DSPAssembler::AssembleFile(const char *fname, int pass)
 		{
 			char c = linebuffer[i];
 			// This stuff handles /**/ and // comments.
-			// modified by Hermes : added // and /* */ for long comentaries 
+			// modified by Hermes : added // and /* */ for long commentaries 
 			if (c == '/')
 			{
 				if (i < 1023)
@@ -892,6 +893,7 @@ bool DSPAssembler::AssembleFile(const char *fname, int pass)
 			if (params[0].type == P_STR)
 			{
 				char *tmpstr;
+				FILE *thisSrc = fsrc;
 				if (include_dir.size())
 				{
 					tmpstr = (char *)malloc(include_dir.size() + strlen(params[0].str) + 2);
@@ -903,6 +905,8 @@ bool DSPAssembler::AssembleFile(const char *fname, int pass)
 					strcpy(tmpstr, params[0].str);
 				}
 				AssembleFile(tmpstr, pass);
+				fsrc = thisSrc;
+
 				free(tmpstr);
 			}
 			else
@@ -983,6 +987,7 @@ bool DSPAssembler::AssembleFile(const char *fname, int pass)
 
 		m_cur_addr += opcode_size;
 	};
+
 	if (gdg_buffer == NULL)
 	{
 		gdg_buffer_size = m_cur_addr;
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index fe61f9469c..61c4d6bcdb 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -497,9 +497,10 @@ void CFrame::DoOpen(bool Boot)
 
 void CFrame::OnChangeDisc(wxCommandEvent& WXUNUSED (event))
 {
-	DVDInterface::SetLidOpen();
+	DVDInterface::SetLidOpen(true);
 	DoOpen(false);
 	DVDInterface::SetLidOpen(false);
+	DVDInterface::SetDiscInside(true);
 }
 
 void CFrame::OnPlay(wxCommandEvent& WXUNUSED (event))
diff --git a/Source/DSPSpy/tests/dsp_base.inc b/Source/DSPSpy/tests/dsp_base.inc
index 33ef0f060b..46d0ba65fd 100644
--- a/Source/DSPSpy/tests/dsp_base.inc
+++ b/Source/DSPSpy/tests/dsp_base.inc
@@ -24,7 +24,7 @@ MEM_LO:                 equ             0x0f7F
 	sbset       #0x05
 	sbset       #0x06
 
-	set16
+	s16
 	lri		$CR, #0x00ff
 
 ; Why do we have a main label here?	
@@ -178,7 +178,7 @@ irq4:
 	jmp		irq
 irq5:
 ; No idea what this code is doing.
-	set16
+	s16
 	mrr		$st1, $ac0.l
 	mrr		$st1, $ac0.m
 	clr		$acc0
diff --git a/Source/Plugins/Plugin_Wiimote/Src/EmuSubroutines.cpp b/Source/Plugins/Plugin_Wiimote/Src/EmuSubroutines.cpp
index b06d834760..f1166beade 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/EmuSubroutines.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/EmuSubroutines.cpp
@@ -84,8 +84,8 @@ void HidOutputReport(u16 _channelID, wm_report* sr) {
 
 	switch(sr->channel)
 	{
-	case 0x10:
-		ERROR_LOG(WII_IPC_WIIMOTE, "HidOutputReport: unknown sr->channel 0x10");
+	case WM_RUMBLE:
+		// TODO: Implement rumble for real wiimotes
 		break;
 	case WM_LEDS: // 0x11
 		WmLeds(_channelID, (wm_leds*)sr->data);