diff --git a/include/fmt/chrono.h b/include/fmt/chrono.h
index f47ff753..aebf858e 100644
--- a/include/fmt/chrono.h
+++ b/include/fmt/chrono.h
@@ -407,7 +407,7 @@ inline T mod(T x, int y) {
 }
 template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value)>
 inline T mod(T x, int y) {
-  return std::fmod(x, y);
+  return std::fmod(x, static_cast<T>(y));
 }
 
 // If T is an integral type, maps T to its unsigned counterpart, otherwise
diff --git a/include/fmt/prepare.h b/include/fmt/prepare.h
index 6c149c25..e1bf4bd1 100644
--- a/include/fmt/prepare.h
+++ b/include/fmt/prepare.h
@@ -1,4 +1,4 @@
-// Formatting library for C++ - format string compilation
+// Formatting library for C++ - experimental format string compilation
 //
 // Copyright (c) 2012 - present, Victor Zverovich and fmt contributors
 // All rights reserved.
@@ -722,8 +722,6 @@ template <typename... Args> struct wprepared_format {
                                      Args...>::type type;
 };
 
-#if FMT_USE_ALIAS_TEMPLATES
-
 template <typename Char, typename Container = std::vector<format_part<Char>>>
 using parts_container_t = typename parts_container<Char, Container>::type;
 
@@ -740,8 +738,6 @@ template <typename... Args>
 using wprepared_format_t =
     basic_prepared_format_t<std::wstring, parts_container<wchar_t>, Args...>;
 
-#endif
-
 #if FMT_USE_CONSTEXPR
 
 template <typename... Args, typename Format>