diff --git a/renderdoc/data/embedded_files.h b/renderdoc/data/embedded_files.h
index 680ffa5da..ae607aea0 100644
--- a/renderdoc/data/embedded_files.h
+++ b/renderdoc/data/embedded_files.h
@@ -29,10 +29,12 @@
 	extern char CONCAT( CONCAT(_binary_, filename) , _end) ;
 
 DECLARE_EMBED(debuguniforms_h);
+DECLARE_EMBED(texsample_h);
 DECLARE_EMBED(blit_vert);
 DECLARE_EMBED(blit_frag);
 DECLARE_EMBED(texdisplay_frag);
 DECLARE_EMBED(checkerboard_frag);
+DECLARE_EMBED(histogram_comp);
 DECLARE_EMBED(mesh_vert);
 DECLARE_EMBED(generic_vert);
 DECLARE_EMBED(generic_frag);
diff --git a/renderdoc/driver/gl/gl_resources.cpp b/renderdoc/driver/gl/gl_resources.cpp
index a60be7b48..f2a7b67c3 100644
--- a/renderdoc/driver/gl/gl_resources.cpp
+++ b/renderdoc/driver/gl/gl_resources.cpp
@@ -416,6 +416,8 @@ GLenum TextureBinding(GLenum target)
 			return eGL_TEXTURE_BINDING_CUBE_MAP_ARRAY;
 		case eGL_TEXTURE_BUFFER:
 			return eGL_TEXTURE_BINDING_BUFFER;
+		default:
+			break;
 	}
 
 	RDCERR("Unexpected target %x", target);
@@ -437,6 +439,8 @@ bool IsProxyTarget(GLenum target)
 		case eGL_PROXY_TEXTURE_CUBE_MAP:
 		case eGL_PROXY_TEXTURE_CUBE_MAP_ARRAY:
 			return true;
+		default:
+			break;
 	}
 
 	return false;
diff --git a/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp
index 6a6078840..35a58ce78 100644
--- a/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp
+++ b/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp
@@ -2006,6 +2006,7 @@ bool WrappedOpenGL::Serialise_glVertexAttrib(GLuint index, int count, GLenum typ
 			case Attrib_GLushort:
 				elemSize = 2;
 				break;
+			default:
 			case Attrib_GLbyte:
 			case Attrib_GLubyte:
 				elemSize = 1;