diff --git a/Machines/Commodore/Vic-20/Vic20.hpp b/Machines/Commodore/Vic-20/Vic20.hpp
index 6267010ca..0ca7b5a7b 100644
--- a/Machines/Commodore/Vic-20/Vic20.hpp
+++ b/Machines/Commodore/Vic-20/Vic20.hpp
@@ -66,8 +66,8 @@ enum JoystickInput {
 };
 
 class Machine:
-	public ConfigurationTarget::Machine,
 	public CRTMachine::Machine,
+	public ConfigurationTarget::Machine,
 	public KeyboardMachine::Machine {
 	public:
 		virtual ~Machine();
diff --git a/StaticAnalyser/Commodore/StaticAnalyser.cpp b/StaticAnalyser/Commodore/StaticAnalyser.cpp
index f06ef5483..b26dbbd63 100644
--- a/StaticAnalyser/Commodore/StaticAnalyser.cpp
+++ b/StaticAnalyser/Commodore/StaticAnalyser.cpp
@@ -53,7 +53,7 @@ void StaticAnalyser::Commodore::AddTargets(const Media &media, std::list<Target>
 	// check disks
 	for(auto &disk : media.disks) {
 		std::list<File> disk_files = GetFiles(disk);
-		if(disk_files.size()) {
+		if(!disk_files.empty()) {
 			is_disk = true;
 			files.splice(files.end(), disk_files);
 			target.media.disks.push_back(disk);
@@ -65,14 +65,14 @@ void StaticAnalyser::Commodore::AddTargets(const Media &media, std::list<Target>
 	for(auto &tape : media.tapes) {
 		std::list<File> tape_files = GetFiles(tape);
 		tape->reset();
-		if(tape_files.size()) {
+		if(!tape_files.empty()) {
 			files.splice(files.end(), tape_files);
 			target.media.tapes.push_back(tape);
 			if(!device) device = 1;
 		}
 	}
 
-	if(files.size()) {
+	if(!files.empty()) {
 		target.vic20.memory_model = Vic20MemoryModel::Unexpanded;
 		std::ostringstream string_stream;
 		string_stream << "LOAD\"" << (is_disk ? "*" : "") << "\"," << device << ",";
@@ -136,6 +136,6 @@ void StaticAnalyser::Commodore::AddTargets(const Media &media, std::list<Target>
 		}
 	}
 
-	if(target.media.tapes.size() || target.media.cartridges.size() || target.media.disks.size())
+	if(!target.media.tapes.empty() || !target.media.cartridges.empty() || !target.media.disks.empty())
 		destination.push_back(target);
 }