diff --git a/InstructionSets/x86/Decoder.cpp b/InstructionSets/x86/Decoder.cpp
index 95cb5e14a..0407e01fb 100644
--- a/InstructionSets/x86/Decoder.cpp
+++ b/InstructionSets/x86/Decoder.cpp
@@ -1119,7 +1119,19 @@ template <Model model> void Decoder<model>::set_32bit_protected_mode(bool enable
 }
 
 // Ensure all possible decoders are built.
-template class InstructionSet::x86::Decoder<InstructionSet::x86::Model::i8086>;
-template class InstructionSet::x86::Decoder<InstructionSet::x86::Model::i80186>;
-template class InstructionSet::x86::Decoder<InstructionSet::x86::Model::i80286>;
+//template class InstructionSet::x86::Decoder<InstructionSet::x86::Model::i8086>;
+//template class InstructionSet::x86::Decoder<InstructionSet::x86::Model::i80186>;
+//template class InstructionSet::x86::Decoder<InstructionSet::x86::Model::i80286>;
 template class InstructionSet::x86::Decoder<InstructionSet::x86::Model::i80386>;
+
+template
+std::pair<int, typename Decoder<InstructionSet::x86::Model::i8086>::InstructionT>
+Decoder<InstructionSet::x86::Model::i8086>::decode(const uint8_t *, size_t);
+
+template
+std::pair<int, typename Decoder<InstructionSet::x86::Model::i80186>::InstructionT>
+Decoder<InstructionSet::x86::Model::i80186>::decode(const uint8_t *, size_t);
+
+template
+std::pair<int, typename Decoder<InstructionSet::x86::Model::i80286>::InstructionT>
+Decoder<InstructionSet::x86::Model::i80286>::decode(const uint8_t *, size_t);
diff --git a/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift b/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift
index fd970f7e5..b96df685d 100644
--- a/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift	
+++ b/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift	
@@ -89,8 +89,8 @@ class MachinePicker: NSObject, NSTableViewDataSource, NSTableViewDelegate {
 		let appleIIgsTabIndex = machineSelector.indexOfTabViewItem(withIdentifier: "appleiigs")
 		machineSelector.removeTabViewItem(machineSelector.tabViewItem(at: appleIIgsTabIndex))
 
-		let pcTabIndex = machineSelector.indexOfTabViewItem(withIdentifier: "pc")
-		machineSelector.removeTabViewItem(machineSelector.tabViewItem(at: pcTabIndex))
+//		let pcTabIndex = machineSelector.indexOfTabViewItem(withIdentifier: "pc")
+//		machineSelector.removeTabViewItem(machineSelector.tabViewItem(at: pcTabIndex))
 
 		machineNameTable.reloadData()