diff --git a/radio/src/gui/480x272/widgets/modelbmp.cpp b/radio/src/gui/480x272/widgets/modelbmp.cpp
index 09e632ab3..b9d00f3f2 100644
--- a/radio/src/gui/480x272/widgets/modelbmp.cpp
+++ b/radio/src/gui/480x272/widgets/modelbmp.cpp
@@ -30,7 +30,7 @@ class ModelBitmapWidget: public Widget
     {
     }
 
-    virtual ~ModelBitmapWidget()
+    ~ModelBitmapWidget() override
     {
       delete buffer;
     }
diff --git a/radio/src/gui/480x272/widgets/outputs.cpp b/radio/src/gui/480x272/widgets/outputs.cpp
index 467657519..387f4f24b 100644
--- a/radio/src/gui/480x272/widgets/outputs.cpp
+++ b/radio/src/gui/480x272/widgets/outputs.cpp
@@ -89,7 +89,7 @@ const ZoneOption OutputsWidget::options[] = {
   { STR_FIRST_CHANNEL, ZoneOption::Integer, OPTION_VALUE_UNSIGNED(1), OPTION_VALUE_UNSIGNED(1), OPTION_VALUE_UNSIGNED(32) },
   { STR_FILL_BACKGROUND, ZoneOption::Bool, OPTION_VALUE_BOOL(false) },
   { STR_BG_COLOR, ZoneOption::Color, OPTION_VALUE_UNSIGNED(LIGHTGREY) },
-  { NULL, ZoneOption::Bool }
+  { nullptr, ZoneOption::Bool }
 };
 
 
diff --git a/radio/src/gui/480x272/widgets_container.h b/radio/src/gui/480x272/widgets_container.h
index c2fbd9cdd..21fa69bc4 100644
--- a/radio/src/gui/480x272/widgets_container.h
+++ b/radio/src/gui/480x272/widgets_container.h
@@ -80,7 +80,7 @@ class WidgetsContainer: public WidgetsContainerInterface
       }
     }
 
-    virtual void createWidget(unsigned int index, const WidgetFactory * factory)
+    void createWidget(unsigned int index, const WidgetFactory * factory) override
     {
       if (widgets) {
         memset(persistentData->zones[index].widgetName, 0, sizeof(persistentData->zones[index].widgetName));
@@ -123,9 +123,9 @@ class WidgetsContainer: public WidgetsContainerInterface
       return &persistentData->options[index];
     }
 
-    virtual unsigned int getZonesCount() const = 0;
+    unsigned int getZonesCount() const override = 0;
 
-    virtual Zone getZone(unsigned int index) const = 0;
+    Zone getZone(unsigned int index) const override = 0;
 
     virtual void refresh()
     {
diff --git a/radio/src/lua/widgets.cpp b/radio/src/lua/widgets.cpp
index 4ab6b967e..1b04e9b7b 100644
--- a/radio/src/lua/widgets.cpp
+++ b/radio/src/lua/widgets.cpp
@@ -253,23 +253,23 @@ class LuaWidget: public Widget
     LuaWidget(const WidgetFactory * factory, const Zone & zone, Widget::PersistentData * persistentData, int widgetData):
       Widget(factory, zone, persistentData),
       widgetData(widgetData),
-      errorMessage(0)
+      errorMessage(nullptr)
     {
     }
 
-    virtual ~LuaWidget()
+    ~LuaWidget() override
     {
       luaL_unref(lsWidgets, LUA_REGISTRYINDEX, widgetData);
-      if (errorMessage) free(errorMessage);
+      free(errorMessage);
     }
 
-    virtual void update();
+    void update() override;
 
     void refresh() override;
 
-    virtual void background();
+    void background() override;
 
-    virtual const char * getErrorMessage() const;
+    const char * getErrorMessage() const override;
 
   protected:
     int widgetData;
@@ -300,7 +300,7 @@ class LuaWidgetFactory: public WidgetFactory
     {
     }
 
-    virtual Widget * create(const Zone & zone, Widget::PersistentData * persistentData, bool init=true) const
+    Widget * create(const Zone & zone, Widget::PersistentData * persistentData, bool init=true) const override
     {
       if (lsWidgets == 0) return 0;
       if (init) {