diff --git a/map/queued_renderer.cpp b/map/queued_renderer.cpp
index 5c5a45ad2d..7fed052676 100644
--- a/map/queued_renderer.cpp
+++ b/map/queued_renderer.cpp
@@ -94,9 +94,9 @@ bool QueuedRenderer::RenderQueuedCommands(int pipelineNum)
 
   yg::gl::Packet::EType bucketType = m_Pipelines[pipelineNum].m_Type;
 
-  while ((it = m_Pipelines[pipelineNum].m_FrameCommands.begin())
-      != m_Pipelines[pipelineNum].m_FrameCommands.end())
+  while (!m_Pipelines[pipelineNum].m_FrameCommands.empty())
   {
+    it = m_Pipelines[pipelineNum].m_FrameCommands.begin();
     if (it->m_command)
       it->m_command->setIsDebugging(m_IsDebugging);
 
diff --git a/yg/geometry_renderer.cpp b/yg/geometry_renderer.cpp
index 1279600968..359c0117ac 100644
--- a/yg/geometry_renderer.cpp
+++ b/yg/geometry_renderer.cpp
@@ -85,7 +85,7 @@ namespace yg
 
 
     void GeometryRenderer::uploadTextureImpl(SkinPage::TUploadQueue const & uploadQueue,
-                                             unsigned start, unsigned end,
+                                             size_t start, size_t end,
                                              shared_ptr<BaseTexture> const & texture,
                                              bool shouldAddCheckPoint)
     {
@@ -117,11 +117,11 @@ namespace yg
 
       /// tracking the number of bytes downloaded onto the texture
       /// in a single shot.
-      unsigned bytesUploaded = 0;
-      unsigned bytesPerPixel = yg::formatSize(resourceManager()->params().m_texFormat);
-      unsigned prev = 0;
+      size_t bytesUploaded = 0;
+      size_t bytesPerPixel = yg::formatSize(resourceManager()->params().m_texFormat);
+      size_t prev = 0;
 
-      for (unsigned i = 0; i < uploadQueue.size(); ++i)
+      for (size_t i = 0; i < uploadQueue.size(); ++i)
       {
         shared_ptr<ResourceStyle> const & style = uploadQueue[i];
 
@@ -135,7 +135,7 @@ namespace yg
         }
       }
 
-      if (uploadQueue.size())
+      if (!uploadQueue.empty())
       {
         uploadTextureImpl(uploadQueue, prev, uploadQueue.size(), texture, false);
         bytesUploaded = 0;
diff --git a/yg/geometry_renderer.hpp b/yg/geometry_renderer.hpp
index b5cd195baf..452d0c9c72 100644
--- a/yg/geometry_renderer.hpp
+++ b/yg/geometry_renderer.hpp
@@ -24,8 +24,8 @@ namespace yg
       DisplayList * m_displayList;
 
       void uploadTextureImpl(SkinPage::TUploadQueue const & uploadQueue,
-                             unsigned start,
-                             unsigned end,
+                             size_t start,
+                             size_t end,
                              shared_ptr<BaseTexture> const & texture,
                              bool shouldAddCheckPoint);