diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp
index 1e388516..453b8d9b 100644
--- a/src/renderer_gl.cpp
+++ b/src/renderer_gl.cpp
@@ -1352,7 +1352,8 @@ namespace bgfx { namespace gl
 
 			if (BX_ENABLED(BX_PLATFORM_NACL) )
 			{
-				m_vaoSupport &= NULL != glGenVertexArrays
+				m_vaoSupport &= true
+					&& NULL != glGenVertexArrays
 					&& NULL != glDeleteVertexArrays
 					&& NULL != glBindVertexArray
 					;
@@ -1399,6 +1400,8 @@ namespace bgfx { namespace gl
 				|| s_extension[Extension::EXT_timer_query         ].m_supported
 				;
 
+			m_timerQuerySupport &= NULL != glGetQueryObjectui64v;
+
 			g_caps.supported |= m_depthTextureSupport
 				? BGFX_CAPS_TEXTURE_COMPARE_LEQUAL
 				: 0