diff --git a/Components/6560/6560.hpp b/Components/6560/6560.hpp
index c5a921923..6675a09e2 100644
--- a/Components/6560/6560.hpp
+++ b/Components/6560/6560.hpp
@@ -102,7 +102,7 @@ template <class T> class MOS6560 {
 			Outputs::CRT::DisplayType display_type;
 
 			switch(output_mode) {
-				case OutputMode::PAL:
+				default:
 					chrominances = pal_chrominances;
 					display_type = Outputs::CRT::PAL50;
 					timing_.cycles_per_line = 71;
diff --git a/Machines/Commodore/Vic-20/Vic20.cpp b/Machines/Commodore/Vic-20/Vic20.cpp
index dde7b8f94..33c12acca 100644
--- a/Machines/Commodore/Vic-20/Vic20.cpp
+++ b/Machines/Commodore/Vic-20/Vic20.cpp
@@ -456,6 +456,10 @@ class ConcreteMachine:
 			ROM character_rom;
 			ROM kernel_rom;
 			switch(region_) {
+				default:
+					character_rom = CharactersEnglish;
+					kernel_rom = KernelPAL;
+				break;
 				case American:
 					character_rom = CharactersEnglish;
 					kernel_rom = KernelNTSC;
@@ -468,10 +472,6 @@ class ConcreteMachine:
 					character_rom = CharactersJapanese;
 					kernel_rom = KernelJapanese;
 				break;
-				case European:
-					character_rom = CharactersEnglish;
-					kernel_rom = KernelPAL;
-				break;
 				case Swedish:
 					character_rom = CharactersSwedish;
 					kernel_rom = KernelSwedish;
diff --git a/Machines/Utility/MachineForTarget.cpp b/Machines/Utility/MachineForTarget.cpp
index 3bd1ed25d..869a203a4 100644
--- a/Machines/Utility/MachineForTarget.cpp
+++ b/Machines/Utility/MachineForTarget.cpp
@@ -51,6 +51,8 @@ template<typename T> class TypedDynamicMachine: public ::Machine::DynamicMachine
 		case StaticAnalyser::Target::Oric:			return new TypedDynamicMachine<Oric::Machine>(Oric::Machine::Oric());
 		case StaticAnalyser::Target::Vic20:			return new TypedDynamicMachine<Commodore::Vic20::Machine>(Commodore::Vic20::Machine::Vic20());
 		case StaticAnalyser::Target::ZX8081:		return new TypedDynamicMachine<ZX8081::Machine>(ZX8081::Machine::ZX8081(target));
+
+		default:	return nullptr;
 	}
 }
 
@@ -62,5 +64,7 @@ std::string Machine::NameForTarget(const StaticAnalyser::Target &target) {
 		case StaticAnalyser::Target::Oric:			return "Oric";
 		case StaticAnalyser::Target::Vic20:			return "Vic20";
 		case StaticAnalyser::Target::ZX8081:		return "ZX8081";
+
+		default:	return "";
 	}
 }