diff --git a/apps/openmw/mwgui/layouts.cpp b/apps/openmw/mwgui/layouts.cpp
index d1f829705..78412d5e2 100644
--- a/apps/openmw/mwgui/layouts.cpp
+++ b/apps/openmw/mwgui/layouts.cpp
@@ -205,7 +205,7 @@ void StatsWindow::setValue (const std::string& id, const MWMechanics::Stat<float
         {"SkillSpeechcraft", ESM::Skill::Speechcraft},
         {"SkillHandToHand", ESM::Skill::HandToHand},
     };
-    for (int i = 0; i < sizeof(skillMap)/sizeof(skillMap[0]); ++i)
+    for (size_t i = 0; i < sizeof(skillMap)/sizeof(skillMap[0]); ++i)
     {
         if (skillMap[i].id == id)
         {
diff --git a/apps/openmw/mwgui/window_manager.cpp b/apps/openmw/mwgui/window_manager.cpp
index eaf461a75..ce13ff977 100644
--- a/apps/openmw/mwgui/window_manager.cpp
+++ b/apps/openmw/mwgui/window_manager.cpp
@@ -333,7 +333,7 @@ void WindowManager::setValue (const std::string& id, const MWMechanics::Stat<int
         ESM::Attribute::Personality,
         ESM::Attribute::Luck
     };
-    for (int i = 0; i < sizeof(ids)/sizeof(ids[0]); ++i)
+    for (size_t i = 0; i < sizeof(ids)/sizeof(ids[0]); ++i)
     {
         if (id != ids[i])
             continue;
@@ -376,7 +376,7 @@ void WindowManager::setValue (const std::string& id, const MWMechanics::Stat<flo
         {"SkillSpeechcraft", ESM::Skill::Speechcraft},
         {"SkillHandToHand", ESM::Skill::HandToHand},
     };
-    for (int i = 0; i < sizeof(skillMap)/sizeof(skillMap[0]); ++i)
+    for (size_t i = 0; i < sizeof(skillMap)/sizeof(skillMap[0]); ++i)
     {
         if (skillMap[i].id == id)
         {
@@ -637,7 +637,6 @@ void WindowManager::onClassQuestionChosen(MyGUI::Widget* _sender, int _index)
 
 void WindowManager::onGenerateClassBack()
 {
-    bool goNext = classChosen; // Go to next dialog if class was previously chosen
     classChosen = true;
 
     if (generateClassResultDialog)