diff --git a/src/modes/clock.cpp b/src/modes/clock.cpp
index 3e240f8eb..bebfe96f6 100644
--- a/src/modes/clock.cpp
+++ b/src/modes/clock.cpp
@@ -136,6 +136,7 @@ void TimedRace::update(const float dt)
             // event
             terminateRace();
             return;
+        default: break;  // default for RACE_PHASE, LIMBO_PHASE
     }
     
     switch(m_mode)
diff --git a/src/modes/clock.hpp b/src/modes/clock.hpp
index bfb4f2ec2..e8bdb9130 100644
--- a/src/modes/clock.hpp
+++ b/src/modes/clock.hpp
@@ -80,7 +80,7 @@ protected:
     Phase          m_previous_phase;
 public:
     TimedRace();
-    ~TimedRace();
+    virtual ~TimedRace();
     
     void reset();
     
diff --git a/src/modes/follow_the_leader.cpp b/src/modes/follow_the_leader.cpp
index 931f7d7c7..89e76579e 100644
--- a/src/modes/follow_the_leader.cpp
+++ b/src/modes/follow_the_leader.cpp
@@ -133,4 +133,4 @@ KartIconDisplayInfo* FollowTheLeaderRace::getKartsDisplayInfo(const RaceGUI* cal
     LinearWorld::getKartsDisplayInfo(caller);
     m_kart_display_info[0].special_title = _("Leader");
     return m_kart_display_info;
-}
\ No newline at end of file
+}
diff --git a/src/modes/linear_world.cpp b/src/modes/linear_world.cpp
index cde3b4d05..6dea86b82 100644
--- a/src/modes/linear_world.cpp
+++ b/src/modes/linear_world.cpp
@@ -501,7 +501,7 @@ void LinearWorld::updateRacePosition ( Kart* kart, KartInfo& kart_info )
     const unsigned int kart_amount = m_kart.size();
     for ( unsigned int j = 0 ; j < kart_amount ; j++ )
     {
-        if(int(j) == kart->getWorldKartId()) continue; // don't compare a kart with itself
+        if(j == kart->getWorldKartId()) continue; // don't compare a kart with itself
         if(m_kart[j]->isEliminated()) continue;   // dismiss eliminated karts   
         
         // Count karts ahead of the current kart, i.e. kart that are already
diff --git a/src/modes/linear_world.hpp b/src/modes/linear_world.hpp
index 06c8efbe2..a7eb92f3b 100644
--- a/src/modes/linear_world.hpp
+++ b/src/modes/linear_world.hpp
@@ -90,4 +90,4 @@ public:
     virtual bool raceHasLaps(){ return true; }
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/modes/standard_race.cpp b/src/modes/standard_race.cpp
index 57d67c1ac..20bde26cc 100644
--- a/src/modes/standard_race.cpp
+++ b/src/modes/standard_race.cpp
@@ -111,4 +111,4 @@ std::string StandardRace::getInternalCode() const
         return "STD_TIMETRIAL";
     else
         return "STANDARD";
-}
\ No newline at end of file
+}