diff --git a/Machines/PCCompatible/PCCompatible.cpp b/Machines/PCCompatible/PCCompatible.cpp
index 46dd450b1..421a64fa9 100644
--- a/Machines/PCCompatible/PCCompatible.cpp
+++ b/Machines/PCCompatible/PCCompatible.cpp
@@ -41,11 +41,15 @@
 #include "../ScanProducer.hpp"
 #include "../TimedMachine.hpp"
 
+#include "../../Analyser/Static/PCCompatible/Target.hpp"
+
 #include <array>
 #include <iostream>
 
 namespace PCCompatible {
 
+using VideoAdaptor = Analyser::Static::PCCompatible::Target::VideoAdaptor;
+
 //bool log = false;
 //std::string previous;
 
@@ -786,6 +790,7 @@ class i8255PortHandler : public Intel::i8255::PortHandler {
 };
 using PPI = Intel::i8255::i8255<i8255PortHandler>;
 
+template <VideoAdaptor video>
 class IO {
 	public:
 		IO(PIT &pit, DMA &dma, PPI &ppi, PIC &pic, MDA &mda, FloppyController &fdc) :
@@ -972,7 +977,7 @@ class IO {
 					// Ignore serial port accesses.
 				break;
 			}
-			return IntT(~0);
+			return 0;
 		}
 
 	private:
@@ -1033,6 +1038,7 @@ class FlowController {
 		bool halted_ = false;
 };
 
+template <VideoAdaptor video>
 class ConcreteMachine:
 	public Machine,
 	public MachineTypes::TimedMachine,
@@ -1123,7 +1129,7 @@ class ConcreteMachine:
 				keyboard_.run_for(Cycles(1));
 
 				// Query for interrupts and apply if pending.
-				if(pic_.pending() && context.flags.flag<InstructionSet::x86::Flag::Interrupt>()) {
+				if(pic_.pending() && context.flags.template flag<InstructionSet::x86::Flag::Interrupt>()) {
 					// Regress the IP if a REP is in-progress so as to resume it later.
 					if(context.flow_controller.should_repeat()) {
 						context.registers.ip() = decoded_ip_;
@@ -1271,7 +1277,7 @@ class ConcreteMachine:
 			Segments segments;
 			Memory memory;
 			FlowController flow_controller;
-			IO io;
+			IO<video> io;
 			static constexpr auto model = InstructionSet::x86::Model::i8086;
 		} context;
 
@@ -1293,7 +1299,14 @@ using namespace PCCompatible;
 
 // See header; constructs and returns an instance of the Amstrad CPC.
 Machine *Machine::PCCompatible(const Analyser::Static::Target *target, const ROMMachine::ROMFetcher &rom_fetcher) {
-	return new PCCompatible::ConcreteMachine(*target, rom_fetcher);
+	using Target = Analyser::Static::PCCompatible::Target;
+	const Target *const pc_target = dynamic_cast<const Target *>(target);
+
+	switch(pc_target->adaptor) {
+		case VideoAdaptor::MDA:	return new PCCompatible::ConcreteMachine<VideoAdaptor::MDA>(*target, rom_fetcher);
+		case VideoAdaptor::CGA:	return new PCCompatible::ConcreteMachine<VideoAdaptor::CGA>(*target, rom_fetcher);
+		default: return nullptr;
+	}
 }
 
 Machine::~Machine() {}
diff --git a/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.h b/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.h
index 2028fb66f..1dca59a35 100644
--- a/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.h	
+++ b/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.h	
@@ -127,6 +127,11 @@ typedef NS_ENUM(NSInteger, CSPCCompatibleModel) {
 	CSPCCompatibleModelTurboXT,
 };
 
+typedef NS_ENUM(NSInteger, CSPCCompatibleVideoAdaptor) {
+	CSPCCompatibleVideoAdaptorMDA,
+	CSPCCompatibleVideoAdaptorCGA,
+};
+
 typedef int Kilobytes;
 
 @interface CSStaticAnalyser : NSObject
@@ -147,7 +152,7 @@ typedef int Kilobytes;
 - (instancetype)initWithVic20Region:(CSMachineVic20Region)region memorySize:(Kilobytes)memorySize hasC1540:(BOOL)hasC1540;
 - (instancetype)initWithZX80MemorySize:(Kilobytes)memorySize useZX81ROM:(BOOL)useZX81ROM;
 - (instancetype)initWithZX81MemorySize:(Kilobytes)memorySize;
-- (instancetype)initWithPCCompatibleModel:(CSPCCompatibleModel)model;
+- (instancetype)initWithPCCompatibleModel:(CSPCCompatibleModel)model videoAdaptor:(CSPCCompatibleVideoAdaptor)adaptor;
 
 @property(nonatomic, readonly, nullable) NSString *optionsNibName;
 @property(nonatomic, readonly) NSString *displayName;
diff --git a/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm b/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm
index bb7c8db8b..b85c1f334 100644
--- a/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm	
+++ b/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm	
@@ -24,6 +24,7 @@
 #include "../../../../../Analyser/Static/Macintosh/Target.hpp"
 #include "../../../../../Analyser/Static/MSX/Target.hpp"
 #include "../../../../../Analyser/Static/Oric/Target.hpp"
+#include "../../../../../Analyser/Static/PCCompatible/Target.hpp"
 #include "../../../../../Analyser/Static/ZX8081/Target.hpp"
 #include "../../../../../Analyser/Static/ZXSpectrum/Target.hpp"
 
@@ -272,11 +273,15 @@
 	return self;
 }
 
-- (instancetype)initWithPCCompatibleModel:(CSPCCompatibleModel)model {
+- (instancetype)initWithPCCompatibleModel:(CSPCCompatibleModel)model videoAdaptor:(CSPCCompatibleVideoAdaptor)adaptor {
 	self = [super init];
 	if(self) {
-		using Target = Analyser::Static::Target;
-		auto target = std::make_unique<Target>(Analyser::Machine::PCCompatible);
+		using Target = Analyser::Static::PCCompatible::Target;
+		auto target = std::make_unique<Target>();
+		switch(adaptor) {
+			case CSPCCompatibleVideoAdaptorMDA:	target->adaptor = Target::VideoAdaptor::MDA;	break;
+			case CSPCCompatibleVideoAdaptorCGA:	target->adaptor = Target::VideoAdaptor::CGA;	break;
+		}
 		_targets.push_back(std::move(target));
 	}
 	return self;
diff --git a/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift b/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift
index 719ce6883..7758a3192 100644
--- a/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift	
+++ b/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift	
@@ -402,7 +402,7 @@ class MachinePicker: NSObject, NSTableViewDataSource, NSTableViewDelegate {
 				return CSStaticAnalyser(oricModel: model, diskInterface: diskInterface)
 
 			case "pc":
-				return CSStaticAnalyser(pcCompatibleModel: .turboXT)
+				return CSStaticAnalyser(pcCompatibleModel: .turboXT, videoAdaptor: .MDA)
 
 			case "spectrum":
 				var model: CSMachineSpectrumModel = .plus2a