diff --git a/src/modules/graphics/opengl/StreamBuffer.cpp b/src/modules/graphics/opengl/StreamBuffer.cpp
index ba56506e5..74f32a0a8 100644
--- a/src/modules/graphics/opengl/StreamBuffer.cpp
+++ b/src/modules/graphics/opengl/StreamBuffer.cpp
@@ -111,6 +111,7 @@ public:
 		if (offset + minsize > bufferSize)
 		{
 			offset = 0;
+			gl.bindBuffer(mode, vbo);
 			glBufferData(glMode, bufferSize, nullptr, GL_STREAM_DRAW);
 		}
 
diff --git a/src/modules/graphics/opengl/Text.cpp b/src/modules/graphics/opengl/Text.cpp
index 4d24d2b1d..db6108fd5 100644
--- a/src/modules/graphics/opengl/Text.cpp
+++ b/src/modules/graphics/opengl/Text.cpp
@@ -65,7 +65,7 @@ void Text::draw(Graphics *gfx, const Matrix4 &m)
 	const size_t color_offset = offsetof(Font::GlyphVertex, color.r);
 	const size_t stride = sizeof(Font::GlyphVertex);
 
-	const GLenum gltype = quadIndices.getType();
+	const GLenum gltype = OpenGL::getGLIndexDataType(quadIndices.getType());
 	const size_t elemsize = quadIndices.getElementSize();
 
 	Graphics::TempTransform transform(gfx, m);