diff --git a/companion/src/storage/bineeprom.h b/companion/src/storage/bineeprom.h
index 8dc5eb78f..2b9a5d18c 100644
--- a/companion/src/storage/bineeprom.h
+++ b/companion/src/storage/bineeprom.h
@@ -36,9 +36,9 @@ class BinEepromFormat : public StorageFormat
     {
     }
 
-    virtual QString name() { return "bin"; }
-    virtual bool load(RadioData & radioData);
-    virtual bool write(const RadioData & radioData);
+    virtual QString name() override { return "bin"; }
+    virtual bool load(RadioData & radioData) override;
+    virtual bool write(RadioData & radioData) override;
 
   protected:
     bool extract(RadioData & radioData, const QByteArray & eeprom);
diff --git a/companion/src/storage/storage.h b/companion/src/storage/storage.h
index 997a69a24..8e0a23562 100644
--- a/companion/src/storage/storage.h
+++ b/companion/src/storage/storage.h
@@ -140,7 +140,7 @@ class Storage : public StorageFormat
     {
     }
 
-    virtual QString name() { return "storage"; }
+    virtual QString name() override { return "storage"; }
 
     void setError(const QString & error)
     {
@@ -154,8 +154,8 @@ class Storage : public StorageFormat
 
     virtual bool load(RadioData & radioData) override;
     virtual bool load(GeneralSettings & generalSettings) override;
-    virtual bool write(RadioData & radioData);
-    virtual bool writeModel(const RadioData & radioData, const int modelIndex);
+    virtual bool write(RadioData & radioData) override;
+    virtual bool writeModel(const RadioData & radioData, const int modelIndex) override;
 
   protected:
     bool fileExists();
diff --git a/radio/src/gui/colorlcd/mainview/view_main_decoration.h b/radio/src/gui/colorlcd/mainview/view_main_decoration.h
index b4bc6a42d..aeb8220ee 100644
--- a/radio/src/gui/colorlcd/mainview/view_main_decoration.h
+++ b/radio/src/gui/colorlcd/mainview/view_main_decoration.h
@@ -40,10 +40,6 @@ class ViewMainDecoration
   rect_t getMainZone() const;
 
  protected:
-  bool showTrims;
-  bool showSliders;
-  bool showFM;
-
   enum {
     SLIDERS_POT1 = 0,
     SLIDERS_POT2,
@@ -69,6 +65,9 @@ class ViewMainDecoration
   Window* w_bl;
   Window* w_bc;
   Window* w_br;
+  bool showTrims;
+  bool showSliders;
+  bool showFM;
 
   Window* sliders[SLIDERS_MAX] = { 0 };
   MainViewTrim* trims[TRIMS_MAX] = { 0 };
diff --git a/radio/src/gyro.cpp b/radio/src/gyro.cpp
index 07b335044..061960a30 100644
--- a/radio/src/gyro.cpp
+++ b/radio/src/gyro.cpp
@@ -79,7 +79,7 @@ void Gyro::wakeup()
 
   int16_t gx = values[0];
   int16_t gy = values[1];
-  int16_t gz = values[2];
+  // int16_t gz = values[2];
 
   // integrate gyro
   roll  -= gx * SCALE_FACT_GYRO * DT;