diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 11997e997d..f85b4d0516 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1206,6 +1206,8 @@ namespace BizHawk.Client.EmuHawk
 				&& !Global.MovieSession.Movie.IsActive;
 
 			barcodeReaderToolStripMenuItem.Enabled = ServiceInjector.IsAvailable(Global.Emulator.ServiceProvider, typeof(BarcodeEntry));
+
+			musicRipperToolStripMenuItem.Enabled = GlobalWin.Tools.IsAvailable<NESMusicRipper>();
 		}
 
 		private void FdsControlsMenuItem_DropDownOpened(object sender, EventArgs e)
diff --git a/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs b/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs
index e8535f9cd5..a0dd430e3a 100644
--- a/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs
@@ -61,11 +61,6 @@ namespace BizHawk.Client.EmuHawk
 			Close();
 		}
 
-		private void RestoreDefaults_Click(object sender, EventArgs e)
-		{
-			Defaults();
-		}
-
 		private void AutoTabCheckBox_CheckedChanged(object sender, EventArgs e)
 		{
 			SetAutoTab();
diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs b/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs
index cf058b67da..de54555a79 100644
--- a/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs
+++ b/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs
@@ -18,7 +18,7 @@ namespace BizHawk.Client.EmuHawk
 	public partial class NESMusicRipper : Form, IToolFormAutoConfig
 	{
 		[RequiredService]
-		private IEmulator _emu { get; set; }
+		private NES nes { get; set; }
 
 		public NESMusicRipper()
 		{
@@ -436,7 +436,6 @@ namespace BizHawk.Client.EmuHawk
 			//fpulse = fCPU/(16*(t+1)) (where fCPU is 1.789773 MHz for NTSC, 1.662607 MHz for PAL, and 1.773448 MHz for Dendy)
 	    //ftriangle = fCPU/(32*(tval + 1))
 
-			var nes = _emu as NES;
 			var apu = nes.apu;
 			
 			//evaluate the pitches
@@ -485,8 +484,6 @@ namespace BizHawk.Client.EmuHawk
 
 		private void btnControl_Click(object sender, EventArgs e)
 		{
-			var nes = _emu as NES;
-
 			if(IsRunning)
 			{
 				SyncContents();
@@ -512,7 +509,6 @@ namespace BizHawk.Client.EmuHawk
 
 		private void NESMusicRipper_FormClosed(object sender, FormClosedEventArgs e)
 		{
-			var nes = _emu as NES;
 			var apu = nes.apu;
 			apu.DebugCallbackDivider = 0;
 			apu.DebugCallbackTimer = 0;