diff --git a/Machines/AmstradCPC/AmstradCPC.cpp b/Machines/AmstradCPC/AmstradCPC.cpp
index 2ed260da0..410e50123 100644
--- a/Machines/AmstradCPC/AmstradCPC.cpp
+++ b/Machines/AmstradCPC/AmstradCPC.cpp
@@ -1195,7 +1195,7 @@ public:
 		return options;
 	}
 
-	void set_options(const std::unique_ptr<Reflection::Struct> &str) {
+	void set_options(const std::unique_ptr<Reflection::Struct> &str) final {
 		const auto options = dynamic_cast<Options *>(str.get());
 		set_video_signal_configurable(options->output);
 		allow_fast_tape_hack_ = options->quick_load;
diff --git a/Machines/AmstradCPC/AmstradCPC.hpp b/Machines/AmstradCPC/AmstradCPC.hpp
index 343362c60..07b7ecbed 100644
--- a/Machines/AmstradCPC/AmstradCPC.hpp
+++ b/Machines/AmstradCPC/AmstradCPC.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
+#include "Analyser/Static/StaticAnalyser.hpp"
 #include "Configurable/Configurable.hpp"
 #include "Configurable/StandardOptions.hpp"
-#include "Analyser/Static/StaticAnalyser.hpp"
 #include "Machines/ROMMachine.hpp"
 
 #include <memory>
@@ -58,6 +58,7 @@ struct Machine {
 		}
 	};
 
+	// Provided for running the SHAKER test suite.
 	struct SSMDelegate {
 		virtual void perform(uint16_t) = 0;
 	};