diff --git a/doc/shaders.dox b/doc/shaders.dox
index 44fa4c134..b351aa0a7 100644
--- a/doc/shaders.dox
+++ b/doc/shaders.dox
@@ -27,6 +27,8 @@ namespace Magnum {
 /** @page shaders Builtin shaders
 @brief Overview and basic usage of builtin shaders.
 
+@m_keywords{Shaders}
+
 @tableofcontents
 @m_footernavigation
 
diff --git a/src/Magnum/Shaders/Flat.h b/src/Magnum/Shaders/Flat.h
index eadec22b8..ac877b7da 100644
--- a/src/Magnum/Shaders/Flat.h
+++ b/src/Magnum/Shaders/Flat.h
@@ -152,6 +152,8 @@ template<UnsignedInt dimensions> class MAGNUM_SHADERS_EXPORT Flat: public GL::Ab
          */
         typedef Containers::EnumSet<Flag> Flags;
         #else
+        /* Done this way to be prepared for possible future diversion of 2D
+           and 3D flags (e.g. introducing 3D-specific features) */
         typedef Implementation::FlatFlag Flag;
         typedef Implementation::FlatFlags Flags;
         #endif