diff --git a/include/boost/geometry/algorithms/buffer.hpp b/include/boost/geometry/algorithms/buffer.hpp
index 2edce0a09..29966d8cc 100644
--- a/include/boost/geometry/algorithms/buffer.hpp
+++ b/include/boost/geometry/algorithms/buffer.hpp
@@ -145,11 +145,12 @@ inline void buffer(Input const& geometry_in, Output& geometry_out,
 \tparam Distance \tparam_numeric
 \param geometry \param_geometry
 \param distance The distance to be used for the buffer
-\param chord_length (optional) The length of the chord's in the generated arcs around points or bends
+\param chord_length (optional) The length of the chord's in the generated arcs
+    around points or bends
 \return \return_calc{buffer}
  */
-template <typename Output, typename Input, typename T>
-Output return_buffer(Input const& geometry, T const& distance, T const& chord_length = -1)
+template <typename Output, typename Input, typename Distance>
+Output return_buffer(Input const& geometry, Distance const& distance, Distance const& chord_length = -1)
 {
     concept::check<Input const>();
     concept::check<Output>();
diff --git a/include/boost/geometry/core/exterior_ring.hpp b/include/boost/geometry/core/exterior_ring.hpp
index 70012c22d..e5c97dd30 100644
--- a/include/boost/geometry/core/exterior_ring.hpp
+++ b/include/boost/geometry/core/exterior_ring.hpp
@@ -101,7 +101,7 @@ struct exterior_ring<polygon_tag, Polygon>
     \brief Function to get the exterior_ring ring of a polygon
     \ingroup exterior_ring
     \note OGC compliance: instead of ExteriorRing
-    \tparam P polygon type
+    \tparam Polygon polygon type
     \param polygon the polygon to get the exterior ring from
     \return a reference to the exterior ring
 */