diff --git a/Analyser/Static/Thomson/StaticAnalyser.cpp b/Analyser/Static/Thomson/StaticAnalyser.cpp
index 28abce04a..d903599e6 100644
--- a/Analyser/Static/Thomson/StaticAnalyser.cpp
+++ b/Analyser/Static/Thomson/StaticAnalyser.cpp
@@ -99,8 +99,9 @@ Analyser::Static::TargetList Analyser::Static::Thomson::GetTargets(
 					}
 				};
 
+				// TODO: determine whether BASIC 1 or BASIC 128 is appropriate.
 				if(DefaultMO6) {
-					target->loading_command = std::wstring(L"1    ") + command() + L"\n";
+					target->loading_command = std::wstring(L"2                ") + command() + L"\n";
 				} else {
 					target->loading_command = command() + L"\n";
 				}
@@ -113,7 +114,7 @@ Analyser::Static::TargetList Analyser::Static::Thomson::GetTargets(
 		target->floppy = MOTarget::Floppy::CD90_640;
 		target->media.disks = media.disks;
 		if(DefaultMO6) {
-			target->loading_command = L"1";
+			target->loading_command = L"2";
 		}
 	}
 
diff --git a/Machines/Thomson/MO/MO.cpp b/Machines/Thomson/MO/MO.cpp
index 04d3d6139..0506fc2f1 100644
--- a/Machines/Thomson/MO/MO.cpp
+++ b/Machines/Thomson/MO/MO.cpp
@@ -664,14 +664,14 @@ private:
 
 	HalfCycles typer_delay(const std::wstring &) const final {
 		if(m6809_.template get<CPU::M6809::Line::PowerOnReset>()) {
-			return is_mo6 ? Cycles(1'750'000) : Cycles(1'000'000);
+			return is_mo6 ? Cycles(1'000'000) : Cycles(1'000'000);
 		} else {
 			return Cycles(0);
 		}
 	}
 
 	HalfCycles typer_frequency() const final {
-		return Cycles(20'000);
+		return Cycles(30'000);
 	}
 
 	// MARK: - MediaTarget and MediaChangeObserver.