diff --git a/src/AbstractImage.cpp b/src/AbstractImage.cpp
index de0e9929c..075ff69b3 100644
--- a/src/AbstractImage.cpp
+++ b/src/AbstractImage.cpp
@@ -14,6 +14,9 @@
 */
 
 #include "AbstractImage.h"
+
+#include <Utility/Debug.h>
+
 #include "TypeTraits.h"
 
 using namespace std;
@@ -71,6 +74,8 @@ size_t AbstractImage::pixelSize(Components format, ComponentType type) {
     switch(format) {
         #ifndef MAGNUM_TARGET_GLES
         case Components::Red:
+        case Components::Green:
+        case Components::Blue:
             return 1*size;
         case Components::RedGreen:
             return 2*size;
@@ -85,9 +90,16 @@ size_t AbstractImage::pixelSize(Components format, ComponentType type) {
         case Components::BGRA:
         #endif
             return 4*size;
-        default:
-            return 0;
+
+        #ifndef MAGNUM_TARGET_GLES
+        case Components::Depth:
+        case Components::StencilIndex:
+        case Components::DepthStencil:
+            CORRADE_ASSERT(false, "AbstractImage::pixelSize(): unhandled depth/stencil type", 0);
+        #endif
     }
+
+    return 0;
 }
 
 }
diff --git a/src/Context.cpp b/src/Context.cpp
index 06cfe594f..23d506d0c 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -129,6 +129,7 @@ const std::vector<Extension>& Extension::extensions(Version version) {
 
     switch(version) {
         case Version::None:  return extensions;
+        case Version::GL210: return empty;
         case Version::GL300: return extensions300;
         case Version::GL310: return extensions310;
         case Version::GL320: return extensions320;
@@ -137,8 +138,9 @@ const std::vector<Extension>& Extension::extensions(Version version) {
         case Version::GL410: return extensions410;
         case Version::GL420: return extensions420;
         case Version::GL430: return extensions430;
-        default: return empty;
     }
+
+    return empty;
 }
 
 Context* Context::_current = nullptr;