diff --git a/InstructionSets/x86/Implementation/FlowControl.hpp b/InstructionSets/x86/Implementation/FlowControl.hpp
index 793f1c911..a8be5cb53 100644
--- a/InstructionSets/x86/Implementation/FlowControl.hpp
+++ b/InstructionSets/x86/Implementation/FlowControl.hpp
@@ -126,13 +126,13 @@ void call_far(
 		return;
 
 		case Source::Indirect:
-			source_address = address<Source::Indirect, uint16_t, AccessType::Read>(instruction, pointer, context);
+			source_address = uint16_t(address<Source::Indirect, uint16_t, AccessType::Read>(instruction, pointer, context));
 		break;
 		case Source::IndirectNoBase:
-			source_address = address<Source::IndirectNoBase, uint16_t, AccessType::Read>(instruction, pointer, context);
+			source_address = uint16_t(address<Source::IndirectNoBase, uint16_t, AccessType::Read>(instruction, pointer, context));
 		break;
 		case Source::DirectAddress:
-			source_address = address<Source::DirectAddress, uint16_t, AccessType::Read>(instruction, pointer, context);
+			source_address = uint16_t(address<Source::DirectAddress, uint16_t, AccessType::Read>(instruction, pointer, context));
 		break;
 	}
 
@@ -161,13 +161,13 @@ void jump_far(
 		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);
+			source_address = uint16_t(address<Source::Indirect, uint16_t, AccessType::Read>(instruction, pointer, context));
 		break;
 		case Source::IndirectNoBase:
-			source_address = address<Source::IndirectNoBase, uint16_t, AccessType::Read>(instruction, pointer, context);
+			source_address = uint16_t(address<Source::IndirectNoBase, uint16_t, AccessType::Read>(instruction, pointer, context));
 		break;
 		case Source::DirectAddress:
-			source_address = address<Source::DirectAddress, uint16_t, AccessType::Read>(instruction, pointer, context);
+			source_address = uint16_t(address<Source::DirectAddress, uint16_t, AccessType::Read>(instruction, pointer, context));
 		break;
 	}
 
diff --git a/InstructionSets/x86/Implementation/LoadStore.hpp b/InstructionSets/x86/Implementation/LoadStore.hpp
index fc05fbb81..6c916b759 100644
--- a/InstructionSets/x86/Implementation/LoadStore.hpp
+++ b/InstructionSets/x86/Implementation/LoadStore.hpp
@@ -35,7 +35,7 @@ void ld(
 	ContextT &context
 ) {
 	const auto pointer = instruction.source();
-	auto source_address = address<uint16_t, AccessType::Read>(instruction, pointer, context);
+	uint16_t source_address = uint16_t(address<uint16_t, AccessType::Read>(instruction, pointer, context));
 	const Source source_segment = instruction.data_segment();
 
 	context.memory.preauthorise_read(source_segment, source_address, 4);
diff --git a/InstructionSets/x86/Implementation/Logical.hpp b/InstructionSets/x86/Implementation/Logical.hpp
index 74c7816ba..3095ad61f 100644
--- a/InstructionSets/x86/Implementation/Logical.hpp
+++ b/InstructionSets/x86/Implementation/Logical.hpp
@@ -136,7 +136,7 @@ void setmo(
 	write_t<IntT> destination,
 	ContextT &context
 ) {
-	const auto result = destination = ~0;
+	const auto result = destination = IntT(~0);
 	context.flags.template set_from<Flag::Carry, Flag::AuxiliaryCarry, Flag::Overflow>(0);
 	context.flags.template set_from<IntT, Flag::Sign, Flag::Zero, Flag::ParityOdd>(result);
 }