diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index cb94eddd78..e16202a047 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -759,13 +759,13 @@ void Launcher::DataFilesPage::slotAddonDataChanged()
 }
 
 // Mutex lock to run reloadCells synchronously.
-std::mutex _reloadCellsMutex;
+static std::mutex reloadCellsMutex;
 
 void Launcher::DataFilesPage::reloadCells(QStringList selectedFiles)
 {
     // Use a mutex lock so that we can prevent two threads from executing the rest of this code at the same time
     // Based on https://stackoverflow.com/a/5429695/531762
-    std::unique_lock<std::mutex> lock(_reloadCellsMutex);
+    std::unique_lock<std::mutex> lock(reloadCellsMutex);
 
     // The following code will run only if there is not another thread currently running it
     CellNameLoader cellNameLoader;
diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp
index 96c42549a5..d215587d49 100644
--- a/apps/openmw/mwgui/journalwindow.cpp
+++ b/apps/openmw/mwgui/journalwindow.cpp
@@ -83,16 +83,16 @@ namespace
                 setVisible (visible);
         }
 
-        void adviseButtonClick (char const * name, void (JournalWindowImpl::*Handler) (MyGUI::Widget* _sender))
+        void adviseButtonClick (char const * name, void (JournalWindowImpl::*handler)(MyGUI::Widget*))
         {
             getWidget <MyGUI::Widget> (name) ->
-                eventMouseButtonClick += newDelegate(this, Handler);
+                eventMouseButtonClick += newDelegate(this, handler);
         }
 
-        void adviseKeyPress (char const * name, void (JournalWindowImpl::*Handler) (MyGUI::Widget* _sender, MyGUI::KeyCode key, MyGUI::Char character))
+        void adviseKeyPress (char const * name, void (JournalWindowImpl::*handler)(MyGUI::Widget*, MyGUI::KeyCode, MyGUI::Char))
         {
             getWidget <MyGUI::Widget> (name) ->
-                eventKeyButtonPressed += newDelegate(this, Handler);
+                eventKeyButtonPressed += newDelegate(this, handler);
         }
 
         MWGui::BookPage* getPage (char const * name)