diff --git a/include/vclib/ext/opengl2/drawable_mesh.h b/include/vclib/ext/opengl2/drawable_mesh.h
index 0447ea3bb..4cf09f02d 100644
--- a/include/vclib/ext/opengl2/drawable_mesh.h
+++ b/include/vclib/ext/opengl2/drawable_mesh.h
@@ -198,14 +198,14 @@ class DrawableMesh : public GenericDrawableMesh
         uint nv = mrb.vertexNumber();
         uint nt = mrb.triangleNumber();
 
-        const float* coords          = mrb.vertexBufferData();
-        const int*   triangles       = mrb.triangleBufferData();
-        const float* vertexNormals   = mrb.vertexNormalBufferData();
-        const float* vertexColors    = mrb.vertexColorBufferData();
-        const float* triangleNormals = mrb.triangleNormalBufferData();
-        const float* triangleColors  = mrb.triangleColorBufferData();
-        const float* vertTexCoords   = mrb.vertexTexCoordsBufferData();
-        const float* wedgTexCoords   = mrb.wedgeTexCoordsBufferData();
+        const float*    coords          = mrb.vertexBufferData();
+        const uint32_t* triangles       = mrb.triangleBufferData();
+        const float*    vertexNormals   = mrb.vertexNormalBufferData();
+        const float*    vertexColors    = mrb.vertexColorBufferData();
+        const float*    triangleNormals = mrb.triangleNormalBufferData();
+        const float*    triangleColors  = mrb.triangleColorBufferData();
+        const float*    vertTexCoords   = mrb.vertexTexCoordsBufferData();
+        const float*    wedgTexCoords   = mrb.wedgeTexCoordsBufferData();
 
         if (mrs.isPointCloudVisible()) {
             glEnableClientState(GL_VERTEX_ARRAY);
diff --git a/include/vclib/render/mesh_render_buffers.h b/include/vclib/render/mesh_render_buffers.h
index 5cb8df722..4a894a298 100644
--- a/include/vclib/render/mesh_render_buffers.h
+++ b/include/vclib/render/mesh_render_buffers.h
@@ -40,16 +40,16 @@ class MeshRenderBuffers
     uint nv = 0;
     uint nt = 0;
 
-    std::vector<float>   verts;
-    std::vector<int>     tris;
-    std::vector<float>   vNormals;
-    std::vector<float>   vColors;
-    std::vector<float>   tNormals;
-    std::vector<float>   tColors;
-    std::vector<float>   vTexCoords;
-    std::vector<float>   wTexCoords;
-    std::vector<short>   wTexIds;
-    std::array<float, 4> mColor;
+    std::vector<float>    verts;
+    std::vector<uint32_t> tris;
+    std::vector<float>    vNormals;
+    std::vector<float>    vColors;
+    std::vector<float>    tNormals;
+    std::vector<float>    tColors;
+    std::vector<float>    vTexCoords;
+    std::vector<float>    wTexCoords;
+    std::vector<short>    wTexIds;
+    std::array<float, 4>  mColor;
 
     vcl::Point3d            bbmin, bbmax;
     vcl::TriPolyIndexBiMap  triPolyMap;
@@ -88,7 +88,7 @@ class MeshRenderBuffers
         return verts.data();
     }
 
-    const int* triangleBufferData() const
+    const uint32_t* triangleBufferData() const
     {
         if (tris.empty())
             return nullptr;