diff --git a/Components/8530/z8530.cpp b/Components/8530/z8530.cpp
index e4afa96e5..f65c2dbc6 100644
--- a/Components/8530/z8530.cpp
+++ b/Components/8530/z8530.cpp
@@ -316,6 +316,8 @@ void z8530::Channel::write(bool data, uint8_t pointer, uint8_t value) {
 				}
 				LOG("Receive bit count: " << receive_bit_count);
 
+				(void)receive_bit_count;
+
 				/*
 					b7,b6:
 						00 = 5 receive bits per character
diff --git a/OSBindings/SDL/SConstruct b/OSBindings/SDL/SConstruct
index e1a746ac8..f55a0e22b 100644
--- a/OSBindings/SDL/SConstruct
+++ b/OSBindings/SDL/SConstruct
@@ -1,19 +1,19 @@
 import glob
 import sys
 
-# establish UTF-8 encoding for Python 2
+# Establish UTF-8 encoding for Python 2.
 if sys.version_info < (3, 0):
 	reload(sys)
 	sys.setdefaultencoding('utf-8')
 
-# create build environment
+# Create build environment.
 env = Environment()
 
-# determine compiler and linker flags for SDL
+# Determine compiler and linker flags for SDL.
 env.ParseConfig('sdl2-config --cflags')
 env.ParseConfig('sdl2-config --libs')
 
-# gather a list of source files
+# Gather a list of source files.
 SOURCES = glob.glob('*.cpp')
 
 SOURCES += glob.glob('../../Analyser/Dynamic/*.cpp')
@@ -117,11 +117,11 @@ SOURCES += glob.glob('../../Storage/Tape/*.cpp')
 SOURCES += glob.glob('../../Storage/Tape/Formats/*.cpp')
 SOURCES += glob.glob('../../Storage/Tape/Parsers/*.cpp')
 
-# add additional compiler flags
-env.Append(CCFLAGS = ['--std=c++17', '-Wall', '-O2', '-DNDEBUG'])
+# Add additional compiler flags; c++1z is insurance in case c++17 isn't fully implemented.
+env.Append(CCFLAGS = ['--std=c++17', '--std=c++1z', '-Wall', '-O2', '-DNDEBUG'])
 
-# add additional libraries to link against
+# Add additional libraries to link against.
 env.Append(LIBS = ['libz', 'pthread', 'GL'])
 
-# build target
+# Build target.
 env.Program(target = 'clksignal', source = SOURCES)
diff --git a/Storage/Disk/DiskImage/Formats/WOZ.cpp b/Storage/Disk/DiskImage/Formats/WOZ.cpp
index c11292078..98c9151d4 100644
--- a/Storage/Disk/DiskImage/Formats/WOZ.cpp
+++ b/Storage/Disk/DiskImage/Formats/WOZ.cpp
@@ -166,6 +166,7 @@ std::shared_ptr<Track> WOZ::get_track_at_position(Track::Address address) {
 				number_of_bits = std::min(file_.get16le(), uint16_t(6646*8));
 			break;
 
+			default:
 			case Type::WOZ2: {
 				// In WOZ 2 an extra level of indirection allows for variable track sizes.
 				const uint16_t starting_block = file_.get16le();
diff --git a/Storage/Tape/Formats/TZX.cpp b/Storage/Tape/Formats/TZX.cpp
index 1e0b6ceda..8d45f6a8a 100644
--- a/Storage/Tape/Formats/TZX.cpp
+++ b/Storage/Tape/Formats/TZX.cpp
@@ -247,10 +247,10 @@ void TZX::get_data_block(const DataBlock &data_block) {
 
 void TZX::get_data(const Data &data) {
 	// Output data.
-	for(unsigned int c = 0; c < data.data_length; c++) {
+	for(decltype(data.data_length) c = 0; c < data.data_length; c++) {
 		uint8_t next_byte = file_.get8();
 
-		unsigned int bits = (c != data.data_length-1) ? 8 : data.number_of_bits_in_final_byte;
+		auto bits = (c != data.data_length-1) ? 8 : data.number_of_bits_in_final_byte;
 		while(bits--) {
 			unsigned int pulse_length = (next_byte & 0x80) ? data.length_of_one_bit_pulse : data.length_of_zero_bit_pulse;
 			next_byte <<= 1;
diff --git a/Storage/Tape/Formats/TZX.hpp b/Storage/Tape/Formats/TZX.hpp
index e38ad66ec..277cd2464 100644
--- a/Storage/Tape/Formats/TZX.hpp
+++ b/Storage/Tape/Formats/TZX.hpp
@@ -77,7 +77,7 @@ class TZX: public PulseQueuedTape {
 			unsigned int length_of_one_bit_pulse;
 			unsigned int number_of_bits_in_final_byte;
 			unsigned int pause_after_block;
-			long data_length;
+			uint32_t data_length;
 		};
 
 		struct DataBlock {