diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp
index cbba4b60a..5c7913da3 100644
--- a/src/renderer_gl.cpp
+++ b/src/renderer_gl.cpp
@@ -1885,7 +1885,7 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) );
 						const bx::StringView token = bx::StringView(ext.getPtr(), space.getPtr() );
 						updateExtension(token);
 
-						ext.set(token.getTerm() + 1, ext.getTerm() );
+						ext.set(space.getPtr() + (space.isEmpty() ? 0 : 1), ext.getTerm() );
 
 						++index;
 					}
diff --git a/src/renderer_vk.cpp b/src/renderer_vk.cpp
index f9760f04e..555920f5a 100644
--- a/src/renderer_vk.cpp
+++ b/src/renderer_vk.cpp
@@ -903,7 +903,7 @@ VK_IMPORT
 
 				uint32_t numEnabledExtensions = 2;
 
-				const char* enabledExtension[Extension::Count + numEnabledExtensions] =
+				const char* enabledExtension[Extension::Count + 2] =
 				{
 					VK_KHR_SURFACE_EXTENSION_NAME,
 					KHR_SURFACE_EXTENSION_NAME,
@@ -1079,7 +1079,7 @@ VK_IMPORT_INSTANCE
 				g_caps.deviceId = uint16_t(m_deviceProperties.deviceID);
 
 				g_caps.limits.maxTextureSize     = m_deviceProperties.limits.maxImageDimension2D;
-				g_caps.limits.maxFBAttachments   = bx::min<uint8_t>(m_deviceProperties.limits.maxFragmentOutputAttachments, BGFX_CONFIG_MAX_FRAME_BUFFER_ATTACHMENTS);
+				g_caps.limits.maxFBAttachments   = bx::min(uint8_t(m_deviceProperties.limits.maxFragmentOutputAttachments), uint8_t(BGFX_CONFIG_MAX_FRAME_BUFFER_ATTACHMENTS) );
 				g_caps.limits.maxComputeBindings = BGFX_MAX_COMPUTE_BINDINGS;
 
 				{