diff --git a/Storage/Disk/DiskImage/Formats/AppleDSK.cpp b/Storage/Disk/DiskImage/Formats/AppleDSK.cpp
index 209b57f8e..879abb303 100644
--- a/Storage/Disk/DiskImage/Formats/AppleDSK.cpp
+++ b/Storage/Disk/DiskImage/Formats/AppleDSK.cpp
@@ -100,7 +100,7 @@ void AppleDSK::set_tracks(const std::map<Track::Address, std::shared_ptr<Track>>
 	std::map<Track::Address, std::vector<uint8_t>> tracks_by_address;
 	for(const auto &pair: tracks) {
 		// Decode the track.
-		auto sector_map = Storage::Encodings::AppleGCR::sectors_from_segment(
+		const auto sector_map = Storage::Encodings::AppleGCR::sectors_from_segment(
 			Storage::Disk::track_serialisation(*pair.second, Storage::Time(1, 50000)));
 
 		// Rearrange sectors into Apple DOS or Pro-DOS order.
diff --git a/Storage/Disk/Drive.cpp b/Storage/Disk/Drive.cpp
index bee294b19..16a1a1161 100644
--- a/Storage/Disk/Drive.cpp
+++ b/Storage/Disk/Drive.cpp
@@ -340,7 +340,7 @@ void Drive::write_bit(bool value) {
 void Drive::end_writing() {
 	// If the user modifies a track, it's scaled up to a "high" resolution and modifications
 	// are plotted on top of that.
-	static const size_t high_resolution_track_rate = 500000;
+	const size_t high_resolution_track_rate = 500000;
 
 	if(!is_reading_) {
 		is_reading_ = true;
@@ -349,7 +349,7 @@ void Drive::end_writing() {
 			// Avoid creating a new patched track if this one is already patched
 			patched_track_ = std::dynamic_pointer_cast<PCMTrack>(track_);
 			if(!patched_track_ || !patched_track_->is_resampled_clone()) {
-				Track *tr = track_.get();
+				Track *const tr = track_.get();
 				patched_track_.reset(PCMTrack::resampled_clone(tr, high_resolution_track_rate));
 			}
 		}