diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp
index 85630ddb8..5a6d68628 100644
--- a/es-app/src/guis/GuiMenu.cpp
+++ b/es-app/src/guis/GuiMenu.cpp
@@ -515,7 +515,7 @@ void GuiMenu::openSoundSettings()
                 setVolume(static_cast<int>(std::round(system_volume->getValue())));
         // Explicitly delete the VolumeControl instance so that it will reinitialize the
         // next time the menu is entered. This is the easiest way to detect new default
-        // audio devices or changes in audio volume done by the operating system.
+        // audio devices or changes to the audio volume done by the operating system.
         VolumeControl::getInstance()->deleteInstance();
     });
     #endif
diff --git a/es-core/src/InputManager.cpp b/es-core/src/InputManager.cpp
index 205714509..807a48e7d 100644
--- a/es-core/src/InputManager.cpp
+++ b/es-core/src/InputManager.cpp
@@ -43,7 +43,7 @@
 int SDL_USER_CECBUTTONDOWN = -1;
 int SDL_USER_CECBUTTONUP   = -1;
 
-InputManager* InputManager::mInstance = nullptr;
+InputManager* InputManager::sInstance = nullptr;
 
 InputManager::InputManager() : mKeyboardInputConfig(nullptr)
 {
@@ -56,10 +56,10 @@ InputManager::~InputManager()
 
 InputManager* InputManager::getInstance()
 {
-    if (!mInstance)
-        mInstance = new InputManager();
+    if (!sInstance)
+        sInstance = new InputManager();
 
-    return mInstance;
+    return sInstance;
 }
 
 void InputManager::init()
diff --git a/es-core/src/InputManager.h b/es-core/src/InputManager.h
index 9efdfa4ae..ab01ba370 100644
--- a/es-core/src/InputManager.h
+++ b/es-core/src/InputManager.h
@@ -54,7 +54,7 @@ public:
 private:
     InputManager();
 
-    static InputManager* mInstance;
+    static InputManager* sInstance;
 
     static const int DEADZONE = 23000;
 
diff --git a/es-core/src/renderers/Renderer.cpp b/es-core/src/renderers/Renderer.cpp
index 2fd8d6457..f18f20171 100644
--- a/es-core/src/renderers/Renderer.cpp
+++ b/es-core/src/renderers/Renderer.cpp
@@ -82,7 +82,7 @@ namespace Renderer
         LOG(LogInfo) << "Creating window...";
 
         if (SDL_Init(SDL_INIT_VIDEO) != 0) {
-            LOG(LogError) << "Couldn't initialize SDL: " << SDL_GetError() << ".";
+            LOG(LogError) << "Couldn't initialize SDL: " << SDL_GetError();
             return false;
         }