diff --git a/doc/changelog.dox b/doc/changelog.dox
index 99cc74a30..542c42e4c 100644
--- a/doc/changelog.dox
+++ b/doc/changelog.dox
@@ -1486,10 +1486,12 @@ See also:
         @relativeref{Corrade,Containers::Pair} instead
     -   @ref Text::AbstractFont public APIs now take
         @ref Containers::StringView instead of @ref std::string and return
-        @ref Containers::Pair instead of @ref std::pair. Additionally, the
-        internal implementation relies on @ref Containers::ArrayView "Containers::ArrayView<const char32_t>"
-        instead of @ref std::u32string and @ref Containers::Triple instead of
-        @ref std::tuple, but that shouldn't affect end-user code in any way.
+        @relativeref{Corrade,Containers::Pair} instead of @ref std::pair.
+        Additionally, the internal implementation relies on
+        @ref Corrade::Containers::ArrayView "Containers::ArrayView<const char32_t>"
+        instead of @ref std::u32string and
+        @relativeref{Corrade,Containers::Triple} instead of @ref std::tuple,
+        but that shouldn't affect end-user code in any way.
     To handle most backwards compatibility, @ref Corrade/Containers/StringStl.h
     and/or @ref Corrade/Containers/PairStl.h is included in affected headers
     for implicit conversions from/to a @ref std::string and/or @ref std::pair,
@@ -1497,9 +1499,10 @@ See also:
     APIs.
 -   @ref Math::Algorithms::svd() that used to return a @ref std::tuple and
     printed a message to @relativeref{Magnum,Error} if it didn't converge now
-    returns a @ref Containers::Tuple wrapped in an @ref Containers::Optional.
-    As the optional makes this a breaking change, no backwards compatibility
-    header for tuple conversion is included.
+    returns a @relativeref{Corrade,Containers::Triple} wrapped in a
+    @relativeref{Corrade,Containers::Optional}. As the optional makes this a
+    breaking change, no backwards compatibility header for tuple conversion is
+    included.
 -   @ref Image, @ref ImageView and @ref Trade::ImageData now look for a
     @cpp pixelFormatSize() @ce API via ADL instead of @cpp pixelSize() @ce. In
     case you were passing a custom pixel format enum to the image classes, you
diff --git a/src/Magnum/Math/Range.h b/src/Magnum/Math/Range.h
index 5cdbbac81..0757bfb66 100644
--- a/src/Magnum/Math/Range.h
+++ b/src/Magnum/Math/Range.h
@@ -196,7 +196,7 @@ template<UnsignedInt dimensions, class T> class Range {
          * Contrary to what Doxygen shows, returns reference to an
          * one-dimensional fixed-size array of @cpp dimensions*2 @ce elements,
          * i.e. @cpp T(&)[dimensions*2] @ce.
-         * @ref min(), @ref max()
+         * @see @ref min(), @ref max()
          * @todoc Fix once there's a possibility to patch the signature in a
          *      post-processing step (https://github.com/mosra/m.css/issues/56)
          */
diff --git a/src/Magnum/Text/AbstractFont.h b/src/Magnum/Text/AbstractFont.h
index 8b8308610..531ca0a12 100644
--- a/src/Magnum/Text/AbstractFont.h
+++ b/src/Magnum/Text/AbstractFont.h
@@ -452,8 +452,9 @@ class MAGNUM_TEXT_EXPORT AbstractFont: public PluginManager::AbstractPlugin {
          *
          * Expects that a font is opened.
          * @note This function is meant to be used only for font observations
-         *      and conversions. In performance-critical code the @ref layout()
-         *      function should be used instead.
+         *      and conversions. In performance-critical code the
+         *      @ref fillGlyphCache() and @ref layout() functions should be
+         *      used instead.
          */
         UnsignedInt glyphId(char32_t character);
 
diff --git a/src/Magnum/TextureTools/Atlas.cpp b/src/Magnum/TextureTools/Atlas.cpp
index f6d1088fc..879c6748c 100644
--- a/src/Magnum/TextureTools/Atlas.cpp
+++ b/src/Magnum/TextureTools/Atlas.cpp
@@ -88,9 +88,9 @@ Containers::Pair<Int, Containers::Array<Vector3i>> atlasArrayPowerOfTwo(const Ve
     }
 
     /* Sort to have the biggest size first. Assuming the items are square,
-       which is checked below in the loop. It's highly likely there are many
+       which is checked above in the loop. It's highly likely there are many
        textures of the same size, thus use a stable sort to have output
-       consistent across platforms */
+       consistent across platforms. */
     /** @todo stable_sort allocates, would be great if i could make it reuse
         the memory allocated for output */
     std::stable_sort(sortedSizes.begin(), sortedSizes.end(), [](const Vector3i& a, const Vector3i& b) {