diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp
index d560f65d9..86c67ac42 100644
--- a/src/renderer_gl.cpp
+++ b/src/renderer_gl.cpp
@@ -5090,7 +5090,7 @@ namespace bgfx { namespace gl
 					uint32_t version =
 						  usesIUsamplers || usesTexelFetch ? 130
 						: usesTextureLod ? 120
-						: 0
+						: 120
 						;
 
 					if (0 != version)
diff --git a/tools/shaderc/shaderc_glsl.cpp b/tools/shaderc/shaderc_glsl.cpp
index 78328cffb..5e1e5a28f 100644
--- a/tools/shaderc/shaderc_glsl.cpp
+++ b/tools/shaderc/shaderc_glsl.cpp
@@ -10,7 +10,7 @@ namespace bgfx
 {
 	bool compileGLSLShader(bx::CommandLine& _cmdLine, uint32_t _gles, const std::string& _code, bx::WriterI* _writer)
 	{
-		char ch = tolower(_cmdLine.findOption('\0', "type")[0]);
+		char ch = char(tolower(_cmdLine.findOption('\0', "type")[0]) );
 		const glslopt_shader_type type = ch == 'f'
 			? kGlslOptShaderFragment
 			: (ch == 'c' ? kGlslOptShaderCompute : kGlslOptShaderVertex);
@@ -152,7 +152,7 @@ namespace bgfx
 						char arraySize[32];
 						const char* end = bx::strnstr(array, "]", eol-array);
 						bx::strlcpy(arraySize, array+1, end-array);
-						num = atoi(arraySize);
+						num = uint8_t(atoi(arraySize) );
 					}
 					else
 					{