diff --git a/src/AbstractTexture.cpp b/src/AbstractTexture.cpp
index 625359b7f..fdce8c9ea 100644
--- a/src/AbstractTexture.cpp
+++ b/src/AbstractTexture.cpp
@@ -50,7 +50,7 @@ GLfloat AbstractTexture::maxSupportedAnisotropy() {
 
 void AbstractTexture::setMinificationFilter(Filter filter, Mipmap mipmap) {
     #ifndef MAGNUM_TARGET_GLES
-    CORRADE_ASSERT(_target != GL_TEXTURE_RECTANGLE || mipmap == Mipmap::BaseLevel, "AbstractTexture: rectangle textures cannot have mipmaps", )
+    CORRADE_ASSERT(_target != GL_TEXTURE_RECTANGLE || mipmap == Mipmap::BaseLevel, "AbstractTexture: rectangle textures cannot have mipmaps", );
     #endif
 
     bind();
@@ -60,7 +60,7 @@ void AbstractTexture::setMinificationFilter(Filter filter, Mipmap mipmap) {
 
 void AbstractTexture::generateMipmap() {
     #ifndef MAGNUM_TARGET_GLES
-    CORRADE_ASSERT(_target != GL_TEXTURE_RECTANGLE, "AbstractTexture: rectangle textures cannot have mipmaps", )
+    CORRADE_ASSERT(_target != GL_TEXTURE_RECTANGLE, "AbstractTexture: rectangle textures cannot have mipmaps", );
     #endif
 
     bind();
@@ -110,7 +110,7 @@ AbstractTexture::InternalFormat::InternalFormat(AbstractTexture::Components comp
 #ifndef DOXYGEN_GENERATING_OUTPUT
 void AbstractTexture::DataHelper<2>::setWrapping(GLenum target, const Math::Vector<2, Wrapping>& wrapping) {
     #ifndef MAGNUM_TARGET_GLES
-    CORRADE_ASSERT(target != GL_TEXTURE_RECTANGLE || ((wrapping[0] == Wrapping::ClampToEdge || wrapping[0] == Wrapping::ClampToBorder) && (wrapping[0] == Wrapping::ClampToEdge || wrapping[1] == Wrapping::ClampToEdge)), "AbstractTexture: rectangle texture wrapping must either clamp to border or to edge", )
+    CORRADE_ASSERT(target != GL_TEXTURE_RECTANGLE || ((wrapping[0] == Wrapping::ClampToEdge || wrapping[0] == Wrapping::ClampToBorder) && (wrapping[0] == Wrapping::ClampToEdge || wrapping[1] == Wrapping::ClampToEdge)), "AbstractTexture: rectangle texture wrapping must either clamp to border or to edge", );
     #endif
 
     glTexParameteri(target, GL_TEXTURE_WRAP_S, static_cast<GLint>(wrapping[0]));
diff --git a/src/AbstractTexture.h b/src/AbstractTexture.h
index ce766a7ab..cae04f499 100644
--- a/src/AbstractTexture.h
+++ b/src/AbstractTexture.h
@@ -327,19 +327,23 @@ class MAGNUM_EXPORT AbstractTexture {
              * Four-component RGBA, unsigned normalized, each component 4bit,
              * 16bit total.
              */
-            RGBA4 = GL_RGBA4,
+            RGBA4 = GL_RGBA4
 
             #ifndef MAGNUM_TARGET_GLES
+            ,
+
             /**
              * Three-component RGB, float, red and green 11bit, blue 10bit,
              * 32bit total.
              * @requires_gl
              * @requires_gl30 Extension @extension{EXT,packed_float}
              */
-            RG11B10Float = GL_R11F_G11F_B10F,
+            RG11B10Float = GL_R11F_G11F_B10F
             #endif
 
             #if defined(GL_RGB565) || defined(DOXYGEN_GENERATING_OUTPUT)
+            ,
+
             /**
              * Three-component RGB, unsigned normalized, red and blue 5bit,
              * green 6bit, 16bit total.
@@ -619,7 +623,7 @@ class MAGNUM_EXPORT AbstractTexture {
          * to `ClampToBorder`.
          * @requires_gl
          */
-        inline void setBorderColor(const Color4& color) {
+        inline void setBorderColor(const Color4<GLfloat>& color) {
             bind();
             glTexParameterfv(_target, GL_TEXTURE_BORDER_COLOR, color.data());
         }