diff --git a/src/kaleidoscope/simulator/actions/AssertLayerIsActive.h b/src/kaleidoscope/simulator/actions/AssertLayerIsActive.h
index 70e748b6..5cc8a462 100644
--- a/src/kaleidoscope/simulator/actions/AssertLayerIsActive.h
+++ b/src/kaleidoscope/simulator/actions/AssertLayerIsActive.h
@@ -54,7 +54,7 @@ public:
         this->getSimulator()->log() << add_indent << "Layer " << layer_id_ << " expected to be active";
       }
 
-      virtual void describeState(const char *add_indent = "") const {
+      virtual void describeState(const char *add_indent = "") const override {
         this->getSimulator()->log() << add_indent << "Layer " << layer_id_ << " is active: " << Layer.isActive((uint8_t)layer_id_);
       }
 
diff --git a/src/kaleidoscope/simulator/actions/AssertTopActiveLayerIs.h b/src/kaleidoscope/simulator/actions/AssertTopActiveLayerIs.h
index ba1b276b..cd9b4767 100644
--- a/src/kaleidoscope/simulator/actions/AssertTopActiveLayerIs.h
+++ b/src/kaleidoscope/simulator/actions/AssertTopActiveLayerIs.h
@@ -53,7 +53,7 @@ public:
         this->getSimulator()->log() << add_indent << "Top active layer is " << layer_id_;
       }
 
-      virtual void describeState(const char *add_indent = "") const {
+      virtual void describeState(const char *add_indent = "") const override {
         this->getSimulator()->log() << add_indent << "Top active layer is " << Layer.top();
       }
 
diff --git a/src/kaleidoscope/simulator/actions/generic_report/GenerateHostEvent.h b/src/kaleidoscope/simulator/actions/generic_report/GenerateHostEvent.h
index 2f604c45..1288def2 100644
--- a/src/kaleidoscope/simulator/actions/generic_report/GenerateHostEvent.h
+++ b/src/kaleidoscope/simulator/actions/generic_report/GenerateHostEvent.h
@@ -63,7 +63,7 @@ public:
         this->getSimulator()->log() << add_indent << "Generating host event";
       }
 
-      virtual void describeState(const char *add_indent = "") const {
+      virtual void describeState(const char *add_indent = "") const override {
         this->describe(add_indent);
       }
 
diff --git a/src/kaleidoscope/simulator/interface/actions/AssertCycleIsNth.h b/src/kaleidoscope/simulator/interface/actions/AssertCycleIsNth.h
index 3b66bef3..7596ced8 100644
--- a/src/kaleidoscope/simulator/interface/actions/AssertCycleIsNth.h
+++ b/src/kaleidoscope/simulator/interface/actions/AssertCycleIsNth.h
@@ -52,7 +52,7 @@ namespace interface {
           this->getSimulator()->log() << add_indent << "Is " << cycle_id_ << ". cycle";
         }
 
-        virtual void describeState(const char *add_indent = "") const {
+        virtual void describeState(const char *add_indent = "") const override {
           this->getSimulator()->log() << add_indent << "Is " << this->getSimulator()->getCycleId() << ". cycle";
         }
 
diff --git a/src/kaleidoscope/simulator/interface/actions/AssertElapsedTimeGreater.h b/src/kaleidoscope/simulator/interface/actions/AssertElapsedTimeGreater.h
index 5a40d4f4..49a4061d 100644
--- a/src/kaleidoscope/simulator/interface/actions/AssertElapsedTimeGreater.h
+++ b/src/kaleidoscope/simulator/interface/actions/AssertElapsedTimeGreater.h
@@ -57,7 +57,7 @@ namespace interface {
           this->getSimulator()->log() << add_indent << "Time elapsed greater " << delta_t_ << " ms";
         }
 
-        virtual void describeState(const char *add_indent = "") const {
+        virtual void describeState(const char *add_indent = "") const override {
           this->getSimulator()->log() << add_indent << "Actual time elapsed "
                                       << this->getSimulator()->getTime() << " ms";
         }
diff --git a/src/kaleidoscope/simulator/interface/actions/AssertNumOverallReportsEquals.h b/src/kaleidoscope/simulator/interface/actions/AssertNumOverallReportsEquals.h
index 5b23174d..8c402a97 100644
--- a/src/kaleidoscope/simulator/interface/actions/AssertNumOverallReportsEquals.h
+++ b/src/kaleidoscope/simulator/interface/actions/AssertNumOverallReportsEquals.h
@@ -57,8 +57,8 @@ namespace interface {
           this->getSimulator()->log() << add_indent << n_overall_reports_ << " overall " << _ReportType::typeString() << " reports expected";
         }
 
-        virtual void describeState(const char *add_indent = "") const {
           this->getSimulator()->log() << add_indent << this->getSimulator()->getNumTypedOverallReports<_ReportType>() << " overall " << _ReportType::typeString() << " reports encountered";
+        virtual void describeState(const char *add_indent = "") const override {
         }
 
         virtual bool evalInternal() override {
diff --git a/src/kaleidoscope/simulator/interface/actions/CustomAction.h b/src/kaleidoscope/simulator/interface/actions/CustomAction.h
index 5faa8d3a..e179fb83 100644
--- a/src/kaleidoscope/simulator/interface/actions/CustomAction.h
+++ b/src/kaleidoscope/simulator/interface/actions/CustomAction.h
@@ -58,7 +58,7 @@ namespace interface {
           this->getSimulator()->log() << add_indent << "Custom keyboard report action";
         }
 
-        virtual void describeState(const char *add_indent = "") const {
+        virtual void describeState(const char *add_indent = "") const override {
           this->getSimulator()->log() << add_indent << "Custom keyboard report action failed";
         }
 
diff --git a/src/kaleidoscope/simulator/interface/actions/generic_report/AssertCycleGeneratesNReports.h b/src/kaleidoscope/simulator/interface/actions/generic_report/AssertCycleGeneratesNReports.h
index 163fae78..07a4539a 100644
--- a/src/kaleidoscope/simulator/interface/actions/generic_report/AssertCycleGeneratesNReports.h
+++ b/src/kaleidoscope/simulator/interface/actions/generic_report/AssertCycleGeneratesNReports.h
@@ -56,8 +56,8 @@ namespace interface {
           this->getSimulator()->log() << add_indent << n_reports_ << " keyboard reports expected in cycle";
         }
 
-        virtual void describeState(const char *add_indent = "") const {
           this->getSimulator()->log() << add_indent << this->getSimulator()->getNumTypedReportsInCycle<_ReportType>() << " keyboard reports encountered";
+        virtual void describeState(const char *add_indent = "") const override {
         }
 
         virtual bool evalInternal() override {
diff --git a/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEmpty.h b/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEmpty.h
index d254f2fb..7b51cb76 100644
--- a/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEmpty.h
+++ b/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEmpty.h
@@ -45,7 +45,7 @@ namespace interface {
           this->getSimulator()->log() << add_indent << "Report empty";
         }
 
-        virtual void describeState(const char *add_indent = "") const {
+        virtual void describeState(const char *add_indent = "") const override {
           this->getSimulator()->log() << add_indent << "Report: ";
           this->getReport().dump(*this->getSimulator(), add_indent);
         }
diff --git a/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEquals.h b/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEquals.h
index 9b47e832..f230319e 100644
--- a/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEquals.h
+++ b/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEquals.h
@@ -70,7 +70,7 @@ namespace interface {
           report_->dump(*this->getSimulator(), add_indent);
         }
 
-        virtual void describeState(const char *add_indent = "") const {
+        virtual void describeState(const char *add_indent = "") const override {
 
           this->getSimulator()->log() << add_indent << "Reports differ: ";
           this->getSimulator()->log() << add_indent << "expected: ";
diff --git a/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportIsNthInCycle.h b/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportIsNthInCycle.h
index 11b5345f..ab9b8a00 100644
--- a/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportIsNthInCycle.h
+++ b/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportIsNthInCycle.h
@@ -52,7 +52,7 @@ namespace interface {
           this->getSimulator()->log() << add_indent << "Report " << report_id_ << ". in cycle";
         }
 
-        virtual void describeState(const char *add_indent = "") const {
+        virtual void describeState(const char *add_indent = "") const override {
           this->getSimulator()->log() << add_indent << "Report is "
                                       << this->getSimulator()->getNumReportsInCycle() << ". in cycle";
         }
diff --git a/src/kaleidoscope/simulator/interface/actions/generic_report/CustomReportAction.h b/src/kaleidoscope/simulator/interface/actions/generic_report/CustomReportAction.h
index d59a5cb3..deb45ba6 100644
--- a/src/kaleidoscope/simulator/interface/actions/generic_report/CustomReportAction.h
+++ b/src/kaleidoscope/simulator/interface/actions/generic_report/CustomReportAction.h
@@ -63,7 +63,7 @@ namespace interface {
                                       << _ReportType::typeString() << " report action";
         }
 
-        virtual void describeState(const char *add_indent = "") const {
+        virtual void describeState(const char *add_indent = "") const override {
           this->getSimulator()->log() << add_indent << "Custom "
                                       << _ReportType::typeString() << " report action failed";
         }
diff --git a/src/kaleidoscope/simulator/interface/actions/generic_report/DumpReport.h b/src/kaleidoscope/simulator/interface/actions/generic_report/DumpReport.h
index 51134aaa..f9834112 100644
--- a/src/kaleidoscope/simulator/interface/actions/generic_report/DumpReport.h
+++ b/src/kaleidoscope/simulator/interface/actions/generic_report/DumpReport.h
@@ -45,7 +45,7 @@ namespace interface {
           this->getReport().dump(*this->getSimulator(), add_indent);
         }
 
-        virtual void describeState(const char *add_indent = "") const {
+        virtual void describeState(const char *add_indent = "") const override {
           this->describe(add_indent);
         }
 
diff --git a/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyKeycodeActive.h b/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyKeycodeActive.h
index 0207ebb2..57d44615 100644
--- a/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyKeycodeActive.h
+++ b/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyKeycodeActive.h
@@ -45,7 +45,7 @@ namespace interface {
           this->getSimulator()->log() << add_indent << "Any keycodes active";
         }
 
-        virtual void describeState(const char *add_indent = "") const {
+        virtual void describeState(const char *add_indent = "") const override {
           this->getSimulator()->log() << add_indent << "Any keycodes active: ";
           this->getSimulator()->log() << this->getReport().isAnyKeyActive();
         }
diff --git a/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyModifierActive.h b/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyModifierActive.h
index 7a37849c..802afe0e 100644
--- a/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyModifierActive.h
+++ b/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyModifierActive.h
@@ -45,7 +45,7 @@ namespace interface {
           this->getSimulator()->log() << add_indent << "Any modifiers active";
         }
 
-        virtual void describeState(const char *add_indent = "") const {
+        virtual void describeState(const char *add_indent = "") const override {
           this->getSimulator()->log() << add_indent << "Any modifiers active: ";
           this->getSimulator()->log() << this->getReport().isAssertAnyModifierActive();
         }
diff --git a/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertKeycodesActive.h b/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertKeycodesActive.h
index 4632b2ce..8cf1feba 100644
--- a/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertKeycodesActive.h
+++ b/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertKeycodesActive.h
@@ -103,7 +103,7 @@ namespace interface {
           }
         }
 
-        virtual void describeState(const char *add_indent = "") const {
+        virtual void describeState(const char *add_indent = "") const override {
 
           this->getSimulator()->log() << add_indent << "Keycodes actually active: ";
 
diff --git a/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertModifiersActive.h b/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertModifiersActive.h
index e6d6cab4..ade7e0ec 100644
--- a/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertModifiersActive.h
+++ b/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertModifiersActive.h
@@ -104,7 +104,7 @@ namespace interface {
           }
         }
 
-        virtual void describeState(const char *add_indent = "") const {
+        virtual void describeState(const char *add_indent = "") const override {
 
           this->getSimulator()->log() << add_indent << "Modifiers actually active: ";