diff --git a/doc/changelog.dox b/doc/changelog.dox
index a2ce112da..8ccc512a7 100644
--- a/doc/changelog.dox
+++ b/doc/changelog.dox
@@ -145,6 +145,7 @@ See also:
     statically built SDL on Windows
 -   `FindMagnum.cmake` now properly recognizes an optional dependency between
     @ref DebugTools and @ref Trade on GL-less builds
+-   Various compiler warning fixes (see [mosra/magnum#406](https://github.com/mosra/magnum/pull/406))
 
 @subsection changelog-latest-bugfixes Bug fixes
 
diff --git a/doc/credits.dox b/doc/credits.dox
index b43deadbd..8eb8173f9 100644
--- a/doc/credits.dox
+++ b/doc/credits.dox
@@ -106,7 +106,7 @@ Are the below lists missing your name or something's wrong?
 -   **Daniel Bloor** ([\@Bluer01](https://github.com/Bluer01)) --- setting old
     code on fire
 -   **Daniel Guzman** ([\@roig](https://github.com/roig)) --- improvements to
-    @ref ResourceManager
+    @ref ResourceManager, warning fixes
 -   **Denis Igorevich Lobanov** ([\@denislobanov](https://github.com/denislobanov))
     --- math fixes
 -   **[\@dlardi](https://github.com/dlardi)** --- WGL-related bugfixes
diff --git a/src/Magnum/Math/Swizzle.h b/src/Magnum/Math/Swizzle.h
index cabccbaf0..7f97125bb 100644
--- a/src/Magnum/Math/Swizzle.h
+++ b/src/Magnum/Math/Swizzle.h
@@ -72,7 +72,8 @@ namespace Implementation {
             return vector._data[i];
         }
     };
-    template<std::size_t size, char component, std::size_t i> struct ScatterComponent: ScatterComponentOr<size, i, static_cast<std::size_t>(component) == i> {
+    /* MSVC complains about C4389 signed/unsigned mismatch without the cast */
+    template<std::size_t size, char component, std::size_t i> struct ScatterComponent: ScatterComponentOr<size, i, std::size_t(component) == i> {
         static_assert(component == 'x' || component == 'r' ||
                     ((component == 'y' || component == 'g') && size > 1) ||
                     ((component == 'z' || component == 'b') && size > 2) ||