diff --git a/yg/path_renderer.cpp b/yg/path_renderer.cpp
index 764ad7a87b..b396a2556d 100644
--- a/yg/path_renderer.cpp
+++ b/yg/path_renderer.cpp
@@ -72,7 +72,7 @@ namespace yg
         }
 
         /// Geometry width. It's 1px wider than the pattern width.
-        int geomWidth = static_cast<uint32_t>(lineStyle->m_penInfo.m_w) + 4 - 2 * aaShift();
+        int geomWidth = static_cast<int>(lineStyle->m_penInfo.m_w) + 4 - 2 * aaShift();
         float geomHalfWidth =  geomWidth / 2.0;
 
         /// Starting point of the tiles on this segment
diff --git a/yg/skin_page.cpp b/yg/skin_page.cpp
index 3ae6abdfe0..8dbc666f77 100644
--- a/yg/skin_page.cpp
+++ b/yg/skin_page.cpp
@@ -460,6 +460,8 @@ namespace yg
             v(static_cast<uint32_t>(curLen + 2 + penInfo.m_pat[i] + 1), y) = px;
 
             curLen += penInfo.m_pat[i];
+
+            curLenI = static_cast<uint32_t>(curLen);
           }
         }
       }