diff --git a/glslang/CInterface/glslang_c_interface.cpp b/glslang/CInterface/glslang_c_interface.cpp
index ae0b3285..68acb68f 100644
--- a/glslang/CInterface/glslang_c_interface.cpp
+++ b/glslang/CInterface/glslang_c_interface.cpp
@@ -355,7 +355,7 @@ int glslang_shader_preprocess(glslang_shader_t* shader, const glslang_input_t* i
     return shader->shader->preprocess(
         /* No user-defined resources limit */
         &glslang::DefaultTBuiltInResource, i->default_version, c_shader_profile(i->default_profile),
-        (bool)i->force_default_version_and_profile, (bool)i->forward_compatible,
+        i->force_default_version_and_profile != 0, i->forward_compatible != 0,
         (EShMessages)c_shader_messages(i->messages), &shader->preprocessedGLSL, Includer
     );
 }
@@ -367,7 +367,7 @@ int glslang_shader_parse(glslang_shader_t* shader, const glslang_input_t* input)
 
     return shader->shader->parse(
         /* No user-defined resource limits for now */
-        &glslang::DefaultTBuiltInResource, input->default_version, (bool)input->forward_compatible,
+        &glslang::DefaultTBuiltInResource, input->default_version, input->forward_compatible != 0,
         (EShMessages)c_shader_messages(input->messages));
 }
 
diff --git a/glslang/MachineIndependent/Intermediate.cpp b/glslang/MachineIndependent/Intermediate.cpp
index ccdc1d90..47de86df 100755
--- a/glslang/MachineIndependent/Intermediate.cpp
+++ b/glslang/MachineIndependent/Intermediate.cpp
@@ -2774,8 +2774,9 @@ bool TIntermediate::postProcess(TIntermNode* root, EShLanguage /*language*/)
     case EShTexSampTransUpgradeTextureRemoveSampler:
         performTextureUpgradeAndSamplerRemovalTransformation(root);
         break;
-    default:
+    case EShTexSampTransCount:
         assert(0);
+        break;
     }
 #endif
 
diff --git a/glslang/MachineIndependent/ShaderLang.cpp b/glslang/MachineIndependent/ShaderLang.cpp
index 44ce1c19..77e58764 100644
--- a/glslang/MachineIndependent/ShaderLang.cpp
+++ b/glslang/MachineIndependent/ShaderLang.cpp
@@ -716,6 +716,9 @@ void TranslateEnvironment(const TEnvironment* environment, EShMessages& messages
             case EShClientOpenGL:
                 spvVersion.openGl = environment->input.dialectVersion;
                 break;
+            case EShClientCount:
+                assert(0);
+                break;
             }
             switch (environment->input.languageFamily) {
             case EShSourceNone:
@@ -728,6 +731,9 @@ void TranslateEnvironment(const TEnvironment* environment, EShMessages& messages
                 source = EShSourceHlsl;
                 messages = static_cast<EShMessages>(messages | EShMsgReadHlsl);
                 break;
+            case EShClientCount:
+                assert(0);
+                break;
             }
         }