Index: code/branches/cpp11_v2/src/modules/overlays/hud/ChatOverlay.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/ChatOverlay.cc	(revision 10845)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/ChatOverlay.cc	(revision 10916)
@@ -58,6 +58,6 @@
     ChatOverlay::~ChatOverlay()
     {
-        for (const auto & elem : this->timers_)
-            delete (elem);
+        for (Timer* timer : this->timers_)
+            delete timer;
     }
 
@@ -92,7 +92,7 @@
         this->text_->setCaption("");
 
-        for (auto & elem : this->messages_)
+        for (const Ogre::DisplayString& message : this->messages_)
         {
-            this->text_->setCaption(this->text_->getCaption() + "\n" + (elem));
+            this->text_->setCaption(this->text_->getCaption() + "\n" + message);
         }
     }
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc	(revision 10845)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc	(revision 10916)
@@ -131,8 +131,8 @@
         }
         this->fontName_ = font;
-        for (auto & elem : this->activeObjectList_)
-        {
-            if (elem.second.text_ != nullptr)
-                elem.second.text_->setFontName(this->fontName_);
+        for (auto& mapEntry : this->activeObjectList_)
+        {
+            if (mapEntry.second.text_ != nullptr)
+                mapEntry.second.text_->setFontName(this->fontName_);
         }
     }
@@ -151,8 +151,8 @@
         }
         this->textSize_ = size;
-        for (auto & elem : this->activeObjectList_)
-        {
-            if (elem.second.text_)
-                elem.second.text_->setCharHeight(size);
+        for (auto& mapEntry : this->activeObjectList_)
+        {
+            if (mapEntry.second.text_)
+                mapEntry.second.text_->setCharHeight(size);
         }
     }
@@ -186,6 +186,6 @@
         const Matrix4& camTransform = cam->getOgreCamera()->getProjectionMatrix() * cam->getOgreCamera()->getViewMatrix();
 
-        for (auto & elem : this->sortedObjectList_)
-        elem.second = (int)((elem.first->getRVWorldPosition() - HumanController::getLocalControllerSingleton()->getControllableEntity()->getWorldPosition()).length() + 0.5f);
+        for (std::pair<RadarViewable*, unsigned int>& pair : this->sortedObjectList_)
+        pair.second = (int)((pair.first->getRVWorldPosition() - HumanController::getLocalControllerSingleton()->getControllableEntity()->getWorldPosition()).length() + 0.5f);
 
         this->sortedObjectList_.sort(compareDistance);
@@ -531,16 +531,16 @@
         float yScale = this->getActualSize().y;
 
-        for (auto & elem : this->activeObjectList_)
-        {
-            if (elem.second.health_ != nullptr)
-                elem.second.health_->setDimensions(this->healthMarkerSize_ * xScale, this->healthMarkerSize_ * yScale);
-            if (elem.second.healthLevel_ != nullptr)
-                elem.second.healthLevel_->setDimensions(this->healthLevelMarkerSize_ * xScale, this->healthLevelMarkerSize_ * yScale);
-            if (elem.second.panel_ != nullptr)
-                elem.second.panel_->setDimensions(this->navMarkerSize_ * xScale, this->navMarkerSize_ * yScale);
-            if (elem.second.text_ != nullptr)
-                elem.second.text_->setCharHeight(this->textSize_ * yScale);
-            if (elem.second.target_ != nullptr)
-                elem.second.target_->setDimensions(this->aimMarkerSize_ * xScale, this->aimMarkerSize_ * yScale);
+        for (auto& mapEntry : this->activeObjectList_)
+        {
+            if (mapEntry.second.health_ != nullptr)
+                mapEntry.second.health_->setDimensions(this->healthMarkerSize_ * xScale, this->healthMarkerSize_ * yScale);
+            if (mapEntry.second.healthLevel_ != nullptr)
+                mapEntry.second.healthLevel_->setDimensions(this->healthLevelMarkerSize_ * xScale, this->healthLevelMarkerSize_ * yScale);
+            if (mapEntry.second.panel_ != nullptr)
+                mapEntry.second.panel_->setDimensions(this->navMarkerSize_ * xScale, this->navMarkerSize_ * yScale);
+            if (mapEntry.second.text_ != nullptr)
+                mapEntry.second.text_->setCharHeight(this->textSize_ * yScale);
+            if (mapEntry.second.target_ != nullptr)
+                mapEntry.second.target_->setDimensions(this->aimMarkerSize_ * xScale, this->aimMarkerSize_ * yScale);
         }
     }
@@ -670,7 +670,7 @@
     {
         const std::set<RadarViewable*>& respawnObjects = this->getOwner()->getScene()->getRadar()->getRadarObjects();
-        for (const auto & respawnObject : respawnObjects)
-        {
-            if (!(respawnObject)->isHumanShip_)
+        for (RadarViewable* respawnObject : respawnObjects)
+        {
+            if (!respawnObject->isHumanShip_)
             this->addObject(respawnObject);
         }
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc	(revision 10845)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc	(revision 10916)
@@ -92,7 +92,7 @@
             Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->map3DBack_);
 
-            for (auto & elem : this->radarObjects_)
-            {
-                Ogre::OverlayManager::getSingleton().destroyOverlayElement(elem.second);
+            for (auto& mapEntry : this->radarObjects_)
+            {
+                Ogre::OverlayManager::getSingleton().destroyOverlayElement(mapEntry.second);
             }
         }
Index: code/branches/cpp11_v2/src/modules/overlays/stats/Scoreboard.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/stats/Scoreboard.cc	(revision 10845)
+++ code/branches/cpp11_v2/src/modules/overlays/stats/Scoreboard.cc	(revision 10916)
@@ -60,6 +60,6 @@
         SUPER(Scoreboard, changedVisibility);
 
-        for (auto & elem : this->lines_)
-            elem->changedVisibility();
+        for (CreateLines* line : this->lines_)
+            line->changedVisibility();
     }
 
@@ -94,9 +94,9 @@
 
         unsigned int index = 0;
-        for (const auto & elem : playerList)
+        for (const auto& mapEntry : playerList)
         {
-            this->lines_[index]->setPlayerName(multi_cast<std::string>(elem.first->getName()));
-            this->lines_[index]->setScore(multi_cast<std::string>(elem.second.frags_));
-            this->lines_[index]->setDeaths(multi_cast<std::string>(elem.second.killed_));
+            this->lines_[index]->setPlayerName(multi_cast<std::string>(mapEntry.first->getName()));
+            this->lines_[index]->setScore(multi_cast<std::string>(mapEntry.second.frags_));
+            this->lines_[index]->setDeaths(multi_cast<std::string>(mapEntry.second.killed_));
             index++;
         }
