diff --git a/Components/9918/Implementation/Draw.hpp b/Components/9918/Implementation/Draw.hpp
index ee5dcb9cc..5bf4a5757 100644
--- a/Components/9918/Implementation/Draw.hpp
+++ b/Components/9918/Implementation/Draw.hpp
@@ -15,7 +15,7 @@ namespace TI::TMS {
 
 template <Personality personality>
 template <SpriteMode mode, bool double_width>
-void Base<personality>::draw_sprites(uint8_t y, int start, int end, const std::array<uint32_t, 16> &palette, int *colour_buffer) {
+void Base<personality>::draw_sprites([[maybe_unused]] uint8_t y, int start, int end, const std::array<uint32_t, 16> &palette, int *colour_buffer) {
 	if(!draw_line_buffer_->sprites) {
 		return;
 	}
@@ -346,7 +346,7 @@ void Base<personality>::draw_tms_text(int start, int end) {
 // MARK: - Master System
 
 template <Personality personality>
-void Base<personality>::draw_sms(int start, int end, uint32_t cram_dot) {
+void Base<personality>::draw_sms([[maybe_unused]] int start, [[maybe_unused]] int end, [[maybe_unused]] uint32_t cram_dot) {
 	if constexpr (is_sega_vdp(personality)) {
 		int colour_buffer[256];
 		auto &line_buffer = *draw_line_buffer_;
@@ -451,7 +451,7 @@ void Base<personality>::draw_sms(int start, int end, uint32_t cram_dot) {
 template <Personality personality>
 template <ScreenMode mode>
 void Base<personality>::draw_yamaha(uint8_t y, int start, int end) {
-	const auto active_palette = palette();
+	[[maybe_unused]] const auto active_palette = palette();
 	const int sprite_start = start >> 2;
 	const int sprite_end = end >> 2;
 	auto &line_buffer = *draw_line_buffer_;
diff --git a/Components/9918/Implementation/Fetch.hpp b/Components/9918/Implementation/Fetch.hpp
index 7f7ea7fff..1b644c978 100644
--- a/Components/9918/Implementation/Fetch.hpp
+++ b/Components/9918/Implementation/Fetch.hpp
@@ -588,7 +588,7 @@ struct SMSSequencer {
 };
 
 template <Personality personality>
-template<bool use_end> void Base<personality>::fetch_sms(uint8_t y, int start, int end) {
+template<bool use_end> void Base<personality>::fetch_sms([[maybe_unused]] uint8_t y, [[maybe_unused]] int start, [[maybe_unused]] int end) {
 	if constexpr (is_sega_vdp(personality)) {
 		SMSSequencer<personality> sequencer(this, y);
 		dispatch<use_end>(sequencer, start, end);
diff --git a/Components/Serial/Line.cpp b/Components/Serial/Line.cpp
index 62ce110a0..d6eb875eb 100644
--- a/Components/Serial/Line.cpp
+++ b/Components/Serial/Line.cpp
@@ -129,7 +129,7 @@ bool Line<include_clock>::read() const {
 }
 
 template <bool include_clock>
-void Line<include_clock>::set_read_delegate(ReadDelegate *delegate, Storage::Time bit_length) {
+void Line<include_clock>::set_read_delegate(ReadDelegate *delegate, [[maybe_unused]] Storage::Time bit_length) {
 	read_delegate_ = delegate;
 	if constexpr (!include_clock) {
 		assert(bit_length > Storage::Time(0));
diff --git a/Machines/MSX/MSX.cpp b/Machines/MSX/MSX.cpp
index 7a5c3a7ca..cc5de7f72 100644
--- a/Machines/MSX/MSX.cpp
+++ b/Machines/MSX/MSX.cpp
@@ -228,7 +228,7 @@ class ConcreteMachine:
 			uint8_t character_generator = 1;	/* 0 = Japan, 1 = USA, etc, 2 = USSR */
 			uint8_t date_format = 1;			/* 0 = Y/M/D, 1 = M/D/Y, 2 = D/M/Y */
 			uint8_t keyboard = 1;				/* 0 = Japan, 1 = USA, 2 = France, 3 = UK, 4 = Germany, 5 = USSR, 6 = Spain */
-			ROM::Name regional_bios_name;
+			[[maybe_unused]] ROM::Name regional_bios_name;
 
 			switch(target.region) {
 				default:
diff --git a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp
index 2bbf4a405..4fcf507f9 100644
--- a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp
+++ b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp
@@ -523,7 +523,7 @@ template<Model model> class ConcreteMachine:
 				break;
 
 				case PartialMachineCycle::Input: {
-					bool did_match = false;
+					[[maybe_unused]] bool did_match = false;
 					*cycle.value = 0xff;
 
 					if(!(address&32)) {
diff --git a/Processors/68000/Implementation/68000Implementation.hpp b/Processors/68000/Implementation/68000Implementation.hpp
index cd28afa2d..719c53d31 100644
--- a/Processors/68000/Implementation/68000Implementation.hpp
+++ b/Processors/68000/Implementation/68000Implementation.hpp
@@ -727,20 +727,18 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 
 			switch(instruction_.operation) {
 				case InstructionSet::M68k::Operation::Undefined:
-					if(instruction_.operation == InstructionSet::M68k::Operation::Undefined) {
-						switch(opcode_ & 0xf000) {
-							default:
-								exception_vector_ = InstructionSet::M68k::Exception::IllegalInstruction;
-							break;
-							case 0xa000:
-								exception_vector_ = InstructionSet::M68k::Exception::Line1010;
-							break;
-							case 0xf000:
-								exception_vector_ = InstructionSet::M68k::Exception::Line1111;
-							break;
-						}
-						MoveToStateSpecific(StandardException);
+					switch(opcode_ & 0xf000) {
+						default:
+							exception_vector_ = InstructionSet::M68k::Exception::IllegalInstruction;
+						break;
+						case 0xa000:
+							exception_vector_ = InstructionSet::M68k::Exception::Line1010;
+						break;
+						case 0xf000:
+							exception_vector_ = InstructionSet::M68k::Exception::Line1111;
+						break;
 					}
+					MoveToStateSpecific(StandardException);
 
 				StdCASE(NBCD, {
 					if(instruction_.mode(0) == Mode::DataRegisterDirect) {