diff --git a/InstructionSets/x86/Implementation/FlowControl.hpp b/InstructionSets/x86/Implementation/FlowControl.hpp
index 63965cde6..793f1c911 100644
--- a/InstructionSets/x86/Implementation/FlowControl.hpp
+++ b/InstructionSets/x86/Implementation/FlowControl.hpp
@@ -36,7 +36,7 @@ void jump(
 
 	// TODO: proper behaviour in 32-bit.
 	if(condition) {
-		context.flow_controller.jump(uint16_t(context.registers.ip() + displacement));
+		context.flow_controller.template jump<uint16_t>(uint16_t(context.registers.ip() + displacement));
 	}
 }
 
@@ -48,7 +48,7 @@ void loop(
 ) {
 	--counter;
 	if(counter) {
-		context.flow_controller.jump(context.registers.ip() + displacement);
+		context.flow_controller.template jump<uint16_t>(context.registers.ip() + displacement);
 	}
 }
 
@@ -60,7 +60,7 @@ void loope(
 ) {
 	--counter;
 	if(counter && context.flags.template flag<Flag::Zero>()) {
-		context.flow_controller.jump(context.registers.ip() + displacement);
+		context.flow_controller.template jump<uint16_t>(context.registers.ip() + displacement);
 	}
 }
 
@@ -72,26 +72,30 @@ void loopne(
 ) {
 	--counter;
 	if(counter && !context.flags.template flag<Flag::Zero>()) {
-		context.flow_controller.jump(context.registers.ip() + displacement);
+		context.flow_controller.template jump<uint16_t>(context.registers.ip() + displacement);
 	}
 }
 
-template <typename IntT, typename ContextT>
+template <typename AddressT, typename ContextT>
 void call_relative(
-	typename std::make_signed<IntT>::type offset,
+	typename std::make_signed<AddressT>::type offset,
 	ContextT &context
 ) {
-	push<uint16_t, false>(context.registers.ip(), context);
-	context.flow_controller.jump(context.registers.ip() + offset);
+	if constexpr (std::is_same_v<AddressT, uint16_t>) {
+		push<uint16_t, false>(context.registers.ip(), context);
+		context.flow_controller.template jump<AddressT>(AddressT(context.registers.ip() + offset));
+	} else {
+		assert(false);
+	}
 }
 
-template <typename IntT, typename ContextT>
+template <typename IntT, typename AddressT, typename ContextT>
 void call_absolute(
 	read_t<IntT> target,
 	ContextT &context
 ) {
 	push<uint16_t, false>(context.registers.ip(), context);
-	context.flow_controller.jump(target);
+	context.flow_controller.template jump<AddressT>(AddressT(target));
 }
 
 template <typename IntT, typename ContextT>
@@ -99,10 +103,10 @@ void jump_absolute(
 	read_t<IntT> target,
 	ContextT &context
 ) {
-	context.flow_controller.jump(target);
+	context.flow_controller.template jump<uint16_t>(target);
 }
 
-template <typename InstructionT, typename ContextT>
+template <typename AddressT, typename InstructionT, typename ContextT>
 void call_far(
 	InstructionT &instruction,
 	ContextT &context
@@ -118,7 +122,7 @@ void call_far(
 		case Source::Immediate:
 			push<uint16_t, true>(context.registers.cs(), context);
 			push<uint16_t, true>(context.registers.ip(), context);
-			context.flow_controller.jump(instruction.segment(), instruction.offset());
+			context.flow_controller.template jump<uint16_t>(instruction.segment(), instruction.offset());
 		return;
 
 		case Source::Indirect:
@@ -141,7 +145,7 @@ void call_far(
 	push<uint16_t, true>(context.registers.cs(), context);
 	push<uint16_t, true>(context.registers.ip(), context);
 
-	context.flow_controller.jump(segment, offset);
+	context.flow_controller.template jump<AddressT>(segment, offset);
 }
 
 template <typename InstructionT, typename ContextT>
@@ -154,7 +158,7 @@ void jump_far(
 	const auto pointer = instruction.destination();
 	switch(pointer.source()) {
 		default:
-		case Source::Immediate:	context.flow_controller.jump(instruction.segment(), instruction.offset());	return;
+		case Source::Immediate:	context.flow_controller.template jump<uint16_t>(instruction.segment(), instruction.offset());	return;
 
 		case Source::Indirect:
 			source_address = address<Source::Indirect, uint16_t, AccessType::Read>(instruction, pointer, context);
@@ -173,7 +177,7 @@ void jump_far(
 	const uint16_t offset = context.memory.template access<uint16_t, AccessType::PreauthorisedRead>(source_segment, source_address);
 	source_address += 2;
 	const uint16_t segment = context.memory.template access<uint16_t, AccessType::PreauthorisedRead>(source_segment, source_address);
-	context.flow_controller.jump(segment, offset);
+	context.flow_controller.template jump<uint16_t>(segment, offset);
 }
 
 template <typename ContextT>
@@ -185,7 +189,7 @@ void iret(
 	const auto ip = pop<uint16_t, true>(context);
 	const auto cs = pop<uint16_t, true>(context);
 	context.flags.set(pop<uint16_t, true>(context));
-	context.flow_controller.jump(cs, ip);
+	context.flow_controller.template jump<uint16_t>(cs, ip);
 }
 
 template <typename InstructionT, typename ContextT>
@@ -195,7 +199,7 @@ void ret_near(
 ) {
 	const auto ip = pop<uint16_t, false>(context);
 	context.registers.sp() += instruction.operand();
-	context.flow_controller.jump(ip);
+	context.flow_controller.template jump<uint16_t>(ip);
 }
 
 template <typename InstructionT, typename ContextT>
@@ -207,7 +211,7 @@ void ret_far(
 	const auto ip = pop<uint16_t, true>(context);
 	const auto cs = pop<uint16_t, true>(context);
 	context.registers.sp() += instruction.operand();
-	context.flow_controller.jump(cs, ip);
+	context.flow_controller.template jump<uint16_t>(cs, ip);
 }
 
 template <typename ContextT>
diff --git a/InstructionSets/x86/Implementation/PerformImplementation.hpp b/InstructionSets/x86/Implementation/PerformImplementation.hpp
index d0d034801..6c65c7cae 100644
--- a/InstructionSets/x86/Implementation/PerformImplementation.hpp
+++ b/InstructionSets/x86/Implementation/PerformImplementation.hpp
@@ -237,8 +237,8 @@ template <
 		case Operation::CALLrel:
 			Primitive::call_relative<AddressT>(instruction.displacement(), context);
 		return;
-		case Operation::CALLabs:	Primitive::call_absolute<IntT>(destination_r(), context);					return;
-		case Operation::CALLfar:	Primitive::call_far(instruction, context);									return;
+		case Operation::CALLabs:	Primitive::call_absolute<IntT, AddressT>(destination_r(), context);					return;
+		case Operation::CALLfar:	Primitive::call_far<AddressT>(instruction, context);									return;
 
 		case Operation::JMPrel:	jcc(true);														return;
 		case Operation::JMPabs:	Primitive::jump_absolute<IntT>(destination_r(), context);		return;
diff --git a/Machines/PCCompatible/PCCompatible.cpp b/Machines/PCCompatible/PCCompatible.cpp
index dd0cb875e..21acfd8fc 100644
--- a/Machines/PCCompatible/PCCompatible.cpp
+++ b/Machines/PCCompatible/PCCompatible.cpp
@@ -807,11 +807,15 @@ class FlowController {
 			registers_(registers), segments_(segments) {}
 
 		// Requirements for perform.
-		void jump(uint16_t address) {
+		template <typename AddressT>
+		void jump(AddressT address) {
+			static_assert(std::is_same_v<AddressT, uint16_t>);
 			registers_.ip() = address;
 		}
 
-		void jump(uint16_t segment, uint16_t address) {
+		template <typename AddressT>
+		void jump(uint16_t segment, AddressT address) {
+			static_assert(std::is_same_v<AddressT, uint16_t>);
 			registers_.cs() = segment;
 			segments_.did_update(Segments::Source::CS);
 			registers_.ip() = address;
diff --git a/OSBindings/Mac/Clock SignalTests/8088Tests.mm b/OSBindings/Mac/Clock SignalTests/8088Tests.mm
index adffeecd0..ed1c4e35d 100644
--- a/OSBindings/Mac/Clock SignalTests/8088Tests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/8088Tests.mm	
@@ -371,11 +371,15 @@ class FlowController {
 			registers_(registers), segments_(segments) {}
 
 		// Requirements for perform.
-		void jump(uint16_t address) {
+		template <typename AddressT>
+		void jump(AddressT address) {
+			static_assert(std::is_same_v<AddressT, uint16_t>);
 			registers_.ip() = address;
 		}
 
-		void jump(uint16_t segment, uint16_t address) {
+		template <typename AddressT>
+		void jump(uint16_t segment, AddressT address) {
+			static_assert(std::is_same_v<AddressT, uint16_t>);
 			registers_.cs() = segment;
 			segments_.did_update(Segments::Source::CS);
 			registers_.ip() = address;