diff --git a/src/musikcube/app/layout/BrowseLayout.h b/src/musikcube/app/layout/BrowseLayout.h
index f042edcd9..26945a598 100755
--- a/src/musikcube/app/layout/BrowseLayout.h
+++ b/src/musikcube/app/layout/BrowseLayout.h
@@ -58,8 +58,9 @@ namespace musik {
 
                 virtual ~BrowseLayout();
 
-                virtual bool KeyPress(const std::string& key) override;
-                virtual void ProcessMessage(musik::core::runtime::IMessage &message) override;
+                /* IWindow */
+                bool KeyPress(const std::string& key) override;
+                void ProcessMessage(musik::core::runtime::IMessage &message) override;
 
                 void ScrollTo(const std::string& fieldType, int64_t fieldId);
                 void SwitchCategory(const std::string& fieldName);
@@ -68,7 +69,8 @@ namespace musik {
                 void LoadLastSession();
 
             protected:
-                virtual void OnLayout() override;
+                /* LayoutBase */
+                void OnLayout() override;
 
             private:
                 void InitializeWindows();
diff --git a/src/musikcube/app/layout/NowPlayingLayout.h b/src/musikcube/app/layout/NowPlayingLayout.h
index 860879360..9f4a7d1c2 100755
--- a/src/musikcube/app/layout/NowPlayingLayout.h
+++ b/src/musikcube/app/layout/NowPlayingLayout.h
@@ -58,11 +58,13 @@ namespace musik {
 
                 virtual ~NowPlayingLayout();
 
-                virtual void OnVisibilityChanged(bool visible);
-                virtual bool KeyPress(const std::string& key);
+                /* IWindow */
+                void OnVisibilityChanged(bool visible) override;
+                bool KeyPress(const std::string& key) override;
 
             protected:
-                virtual void OnLayout();
+                /* LayoutBase */
+                void OnLayout() override;
 
             private:
                 void InitializeWindows();
diff --git a/src/musikcube/app/window/CategoryListView.h b/src/musikcube/app/window/CategoryListView.h
index ff31e75a6..79afbbf55 100755
--- a/src/musikcube/app/window/CategoryListView.h
+++ b/src/musikcube/app/window/CategoryListView.h
@@ -75,19 +75,20 @@ namespace musik {
 
                 void Reset();
 
-                virtual bool KeyPress(const std::string& key);
-
                 int64_t GetSelectedId();
                 std::string GetSelectedValue();
                 std::string GetFilter();
                 std::string GetFieldName();
                 void SetFieldName(const std::string& fieldName);
 
-                virtual void OnVisibilityChanged(bool visible) override;
+                /* IWindow */
+                bool KeyPress(const std::string& key) override;
+                void OnVisibilityChanged(bool visible) override;
 
             protected:
-                virtual cursespp::IScrollAdapter& GetScrollAdapter();
-                virtual bool OnEntryContextMenu(size_t index);
+                /* IListWindow */
+                cursespp::IScrollAdapter& GetScrollAdapter() override;
+                bool OnEntryContextMenu(size_t index) override;
 
                 void OnQueryCompleted(musik::core::db::IQuery* query);
                 void ShowContextMenu();
@@ -96,10 +97,10 @@ namespace musik {
                 public:
                     Adapter(CategoryListView &parent);
 
-                    virtual size_t GetEntryCount();
+                    size_t GetEntryCount() override;
 
-                    virtual cursespp::IScrollAdapter::EntryPtr
-                        GetEntry(cursespp::ScrollableWindow* window, size_t index);
+                    cursespp::IScrollAdapter::EntryPtr
+                        GetEntry(cursespp::ScrollableWindow* window, size_t index) override;
 
                 private:
                     CategoryListView &parent;
diff --git a/src/musikcube/cursespp/DialogOverlay.cpp b/src/musikcube/cursespp/DialogOverlay.cpp
index 9b5883360..ccbcf9918 100644
--- a/src/musikcube/cursespp/DialogOverlay.cpp
+++ b/src/musikcube/cursespp/DialogOverlay.cpp
@@ -158,7 +158,7 @@ bool DialogOverlay::ProcessKey(const std::string& key) {
         return true;
     }
 
-    if (this->escDismiss && key == "^[" || key == "ESC") {
+    if (this->escDismiss && (key == "^[" || key == "ESC")) {
         this->Dismiss();
         return true;
     }