diff --git a/src/gx/d3d/CGxDeviceD3d.cpp b/src/gx/d3d/CGxDeviceD3d.cpp
index afceedd..ff5fb57 100644
--- a/src/gx/d3d/CGxDeviceD3d.cpp
+++ b/src/gx/d3d/CGxDeviceD3d.cpp
@@ -925,7 +925,7 @@ LPDIRECT3DVERTEXBUFFER9 CGxDeviceD3d::ICreateD3dVB(EGxPoolUsage usage, uint32_t
 
     LPDIRECT3DVERTEXBUFFER9 vertexBuf = nullptr;
 
-    if (SUCCEEDED(this->m_d3dDevice->CreateVertexBuffer(size, d3dUsage, D3DFMT_INDEX16, d3dPool, &vertexBuf, nullptr))) {
+    if (SUCCEEDED(this->m_d3dDevice->CreateVertexBuffer(size, d3dUsage, 0, d3dPool, &vertexBuf, nullptr))) {
         return vertexBuf;
     }
 
diff --git a/src/gx/font/CGxStringBatch.cpp b/src/gx/font/CGxStringBatch.cpp
index 581699d..0500ac7 100644
--- a/src/gx/font/CGxStringBatch.cpp
+++ b/src/gx/font/CGxStringBatch.cpp
@@ -139,9 +139,9 @@ void BATCHEDRENDERFONTDESC::RenderBatch() {
         this->m_face->m_textureCache[i].UpdateDirty();
     }
 
-    int32_t maxBatchCapacity = 2048;
+    const int32_t maxBatchCapacity = 4096; // WORKAROUND! It should be 2048;
 
-    CGxBuf* vertexStream = g_theGxDevicePtr->BufStream(GxPoolTarget_Vertex, 0x18, maxBatchCapacity);
+    CGxBuf* vertexStream = g_theGxDevicePtr->BufStream(GxPoolTarget_Vertex, sizeof(CGxVertexPCT), maxBatchCapacity);
     char* vertexData = g_theGxDevicePtr->BufLock(vertexStream);
     CGxVertexPCT* vertexBuf = reinterpret_cast<CGxVertexPCT*>(vertexData);