diff --git a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
index 9eef84cee..83c1db06a 100644
--- a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
+++ b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
@@ -382,6 +382,13 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 			// Apply the suffix status.
 			status_.set_status(prefetch_.w);
 			did_update_status();
+
+			// Ensure that after this STOP exits, the eventual RTE returns to
+			// after the STOP rather than to it. Unlike most instructions, STOP
+			// has not prefetched the next instruction, so the program counter
+			// is at the actual return point, not beyond it.
+			instruction_address_.l = program_counter_.l;
+
 			[[fallthrough]];
 
 		BeginState(WaitForInterrupt):
diff --git a/Storage/Disk/DiskImage/Formats/IPF.cpp b/Storage/Disk/DiskImage/Formats/IPF.cpp
index a610564d0..a55353fcf 100644
--- a/Storage/Disk/DiskImage/Formats/IPF.cpp
+++ b/Storage/Disk/DiskImage/Formats/IPF.cpp
@@ -401,7 +401,9 @@ void IPF::add_unencoded_data(std::vector<Storage::Disk::PCMSegment> &track, Time
 	segment.length_of_a_bit = bit_length;
 
 	// Length appears to be in pre-encoded bits; double that to get encoded bits.
+#ifndef NDEBUG
 	const auto byte_length = (num_bits + 7) >> 3;
+#endif
 	segment.data.reserve(num_bits * 16);
 
 	auto encoder = Storage::Encodings::MFM::GetMFMEncoder(segment.data);