diff --git a/Machines/MSX/MSX.cpp b/Machines/MSX/MSX.cpp
index 189683e3a..b94958040 100644
--- a/Machines/MSX/MSX.cpp
+++ b/Machines/MSX/MSX.cpp
@@ -82,7 +82,7 @@ class AYPortHandler: public GI::AY38910::PortHandler {
 				// Bit 6: keyboard switch (not universal)
 
 				// Bit 7: tape input
-				return 0x7f | (tape_player_.get_input() ? 0x80 : 0x00);
+				return 0x7f | (tape_player_.get_input() ? 0x00 : 0x80);
 			}
 			return 0xff;
 		}
@@ -340,7 +340,7 @@ class ConcreteMachine:
 							//	b5 	audio output
 
 							//	b4: cassette motor relay
-							tape_player_.set_motor_control(!!(value & 0x10));
+							tape_player_.set_motor_control(!(value & 0x10));
 
 							//	b7: keyboard click
 							bool new_audio_level = !!(value & 0x80);
diff --git a/Storage/Tape/Formats/TZX.cpp b/Storage/Tape/Formats/TZX.cpp
index a528bdbf9..047124597 100644
--- a/Storage/Tape/Formats/TZX.cpp
+++ b/Storage/Tape/Formats/TZX.cpp
@@ -28,7 +28,7 @@ TZX::TZX(const char *file_name) :
 	uint8_t minor_version = file_.get8();
 
 	// Reject if an incompatible version
-	if(major_version != 1 || minor_version > 20)  throw ErrorNotTZX;
+	if(major_version != 1 || minor_version > 21)  throw ErrorNotTZX;
 
 	virtual_reset();
 }
@@ -53,7 +53,7 @@ void TZX::get_next_pulses() {
 			return;
 		}
 
-//		printf("TZX %ld\n", ftell(file_));
+		printf("TZX %02x\n", chunk_id);
 		switch(chunk_id) {
 			case 0x10:	get_standard_speed_data_block();	break;
 			case 0x11:	get_turbo_speed_data_block();		break;