diff --git a/include/fmt/chrono.h b/include/fmt/chrono.h
index b112f76e991c3..4c702c20e7280 100644
--- a/include/fmt/chrono.h
+++ b/include/fmt/chrono.h
@@ -427,7 +427,7 @@ auto write(OutputIt out, const std::tm& time, const std::locale& loc,
            char format, char modifier = 0) -> OutputIt {
   auto&& buf = get_buffer<Char>(out);
   do_write<Char>(buf, time, loc, format, modifier);
-  return buf.out();
+  return get_iterator(buf);
 }
 
 template <typename Char, typename OutputIt,
@@ -1397,7 +1397,7 @@ inline bool isfinite(T) {
 template <typename T, typename Int, FMT_ENABLE_IF(std::is_integral<T>::value)>
 inline Int to_nonnegative_int(T value, Int upper) {
   FMT_ASSERT(std::is_unsigned<Int>::value ||
-             (value >= 0 && to_unsigned(value) <= to_unsigned(upper)),
+                 (value >= 0 && to_unsigned(value) <= to_unsigned(upper)),
              "invalid value");
   (void)upper;
   return static_cast<Int>(value);
diff --git a/include/fmt/format.h b/include/fmt/format.h
index 3734b4198ed04..311783c411a53 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -2089,8 +2089,9 @@ FMT_CONSTEXPR auto make_write_int_arg(T value, sign_t sign)
   return {abs_value, prefix};
 }
 
-template <typename Char = char> struct loc_writer {
-  buffer_appender<Char> out;
+template <typename Char = char, typename OutputIt = buffer_appender<Char>>
+struct loc_writer {
+  OutputIt out;
   const basic_format_specs<Char>& specs;
   std::basic_string<Char> sep;
   std::string grouping;
diff --git a/include/fmt/xchar.h b/include/fmt/xchar.h
index 5fb5c8154fd66..ca82b3a669bd3 100644
--- a/include/fmt/xchar.h
+++ b/include/fmt/xchar.h
@@ -33,7 +33,7 @@ auto write_loc(OutputIt out, basic_format_arg<buffer_context<wchar_t>> val,
   auto grouping = numpunct.grouping();
   if (!grouping.empty()) separator = std::wstring(1, numpunct.thousands_sep());
   return visit_format_arg(
-      loc_writer<wchar_t>{out, specs, separator, grouping, {}}, val);
+      loc_writer<wchar_t, OutputIt>{out, specs, separator, grouping, {}}, val);
 #endif
   return false;
 }