diff --git a/example/kalman_filter/kalman_filter-example_1.cpp b/example/kalman_filter/kalman_filter-example_1.cpp
index 5c73a441..c53f8c7e 100644
--- a/example/kalman_filter/kalman_filter-example_1.cpp
+++ b/example/kalman_filter/kalman_filter-example_1.cpp
@@ -55,11 +55,11 @@ int main()
 
   print_header(initial);
   state next = initial;
-  for (int index = 1; const auto& m : measurements) {
+  for (int index = 1; const auto& v : measurements) {
     const auto& previous = next;
     const auto gain = 1. / index * one;
-    const auto current = state_update(previous, m, gain);
+    const auto current = state_update(previous, v, gain);
     next = current;
-    print(index++, gain, m, current, next);
+    print(index++, gain, v, current, next);
   }
 }
diff --git a/src/core/include/mp-units/bits/magnitude.h b/src/core/include/mp-units/bits/magnitude.h
index ae12b527..27e86d8e 100644
--- a/src/core/include/mp-units/bits/magnitude.h
+++ b/src/core/include/mp-units/bits/magnitude.h
@@ -194,7 +194,7 @@ template<MagnitudeSpec Element>
 }
 
 template<MagnitudeSpec Element>
-[[nodiscard]] consteval ratio get_exponent(Element)
+[[nodiscard]] CONSTEVAL ratio get_exponent(Element)
 {
   if constexpr (detail::is_specialization_of_power_v<Element>)
     return Element::exponent;
diff --git a/src/core/include/mp-units/bits/quantity_concepts.h b/src/core/include/mp-units/bits/quantity_concepts.h
index a544be61..cb1a5694 100644
--- a/src/core/include/mp-units/bits/quantity_concepts.h
+++ b/src/core/include/mp-units/bits/quantity_concepts.h
@@ -39,7 +39,7 @@ void to_base_specialization_of_quantity(const volatile quantity<R, Rep>*);
 
 template<typename T>
 inline constexpr bool is_derived_from_specialization_of_quantity =
-  requires(T* t) { to_base_specialization_of_quantity(t); };
+  requires(std::remove_reference_t<T>* t) { to_base_specialization_of_quantity(t); };
 
 }  // namespace detail
 
diff --git a/src/core/include/mp-units/bits/sudo_cast.h b/src/core/include/mp-units/bits/sudo_cast.h
index 04546df4..8da1f0c5 100644
--- a/src/core/include/mp-units/bits/sudo_cast.h
+++ b/src/core/include/mp-units/bits/sudo_cast.h
@@ -59,7 +59,8 @@ template<Quantity To, typename From>
 // TODO how to constrain the second part here?
 [[nodiscard]] constexpr Quantity auto sudo_cast(From&& q)
 {
-  if constexpr (std::remove_reference_t<From>::unit == To::unit) {
+  constexpr auto q_unit = std::remove_reference_t<From>::unit;
+  if constexpr (q_unit == To::unit) {
     // no scaling of the number needed
     return make_quantity<To::reference>(
       static_cast<TYPENAME To::rep>(std::forward<From>(q).number()));  // this is the only (and recommended) way to do
@@ -68,7 +69,7 @@ template<Quantity To, typename From>
                                                                        // warnings on conversions
   } else {
     // scale the number
-    constexpr Magnitude auto c_mag = get_canonical_unit(q.unit).mag / get_canonical_unit(To::unit).mag;
+    constexpr Magnitude auto c_mag = get_canonical_unit(q_unit).mag / get_canonical_unit(To::unit).mag;
     constexpr Magnitude auto num = numerator(c_mag);
     constexpr Magnitude auto den = denominator(c_mag);
     constexpr Magnitude auto irr = c_mag * (den / num);
diff --git a/src/core/include/mp-units/bits/value_cast.h b/src/core/include/mp-units/bits/value_cast.h
index 92880e16..27c6d268 100644
--- a/src/core/include/mp-units/bits/value_cast.h
+++ b/src/core/include/mp-units/bits/value_cast.h
@@ -42,7 +42,7 @@ namespace mp_units {
  */
 template<Unit auto ToU, typename Q>
 [[nodiscard]] constexpr Quantity auto value_cast(Q&& q)
-  requires Quantity<std::remove_cvref_t<Q>> && (convertible(q.reference, ToU))
+  requires Quantity<std::remove_cvref_t<Q>> && (convertible(std::remove_reference_t<Q>::reference, ToU))
 {
   using q_type = std::remove_reference_t<Q>;
   constexpr auto r = [] {
@@ -71,7 +71,7 @@ template<Representation ToRep, typename Q>
            std::constructible_from<ToRep, typename std::remove_reference_t<Q>::rep>
 [[nodiscard]] constexpr quantity<std::remove_reference_t<Q>::reference, ToRep> value_cast(Q&& q)
 {
-  return detail::sudo_cast<quantity<q.reference, ToRep>>(std::forward<Q>(q));
+  return detail::sudo_cast<quantity<std::remove_reference_t<Q>::reference, ToRep>>(std::forward<Q>(q));
 }
 
 }  // namespace mp_units
diff --git a/src/core/include/mp-units/quantity.h b/src/core/include/mp-units/quantity.h
index f8f7f6de..850cf624 100644
--- a/src/core/include/mp-units/quantity.h
+++ b/src/core/include/mp-units/quantity.h
@@ -326,7 +326,7 @@ public:
 private:
   template<Reference auto R2, typename Rep2>
     requires quantity<R2, std::remove_cvref_t<Rep2>>::_rep_safe_constructible_
-  friend constexpr quantity<R2, std::remove_cvref_t<Rep2>> make_quantity(Rep2&& v);
+  friend constexpr quantity<R2, std::remove_cvref_t<Rep2>> make_quantity(Rep2&&);
 
   template<typename Value>
     requires detail::RepSafeConstructibleFrom<rep, Value&&, unit>
diff --git a/src/core/include/mp-units/quantity_spec.h b/src/core/include/mp-units/quantity_spec.h
index 34280967..0b351508 100644
--- a/src/core/include/mp-units/quantity_spec.h
+++ b/src/core/include/mp-units/quantity_spec.h
@@ -115,15 +115,15 @@ struct quantity_spec_interface {
     return make_quantity<reference<self, std::remove_cvref_t<Q>::unit>{}>(std::forward<Q>(q).number());
   }
 #else
-  template<UnitOf<Self{}> U>
+  template<typename Self_ = Self, UnitOf<Self_{}> U>
   [[nodiscard]] consteval Reference auto operator[](U u) const
   {
     return reference<Self{}, u>{};
   }
 
-  template<typename Q>
+  template<typename Q, typename Self_ = Self>
     requires Quantity<std::remove_cvref_t<Q>> &&
-             (explicitly_convertible(std::remove_reference_t<Q>::quantity_spec, Self{}))
+             (explicitly_convertible(std::remove_reference_t<Q>::quantity_spec, Self_{}))
   [[nodiscard]] constexpr Quantity auto operator()(Q&& q) const
   {
     return make_quantity<reference<Self{}, std::remove_cvref_t<Q>::unit>{}>(std::forward<Q>(q).number());
@@ -291,15 +291,15 @@ struct quantity_spec<Self, QS, Args...> : std::remove_const_t<decltype(QS)> {
   static constexpr quantity_character character = detail::quantity_character_init<Args...>(QS.character);
 
 #ifndef __cpp_explicit_this_parameter
-  template<UnitOf<Self{}> U>
+  template<typename Self_ = Self, UnitOf<Self_{}> U>
   [[nodiscard]] consteval Reference auto operator[](U u) const
   {
     return reference<Self{}, u>{};
   }
 
-  template<typename Q>
+  template<typename Q, typename Self_ = Self>
     requires Quantity<std::remove_cvref_t<Q>> &&
-             (explicitly_convertible(std::remove_reference_t<Q>::quantity_spec, Self{}))
+             (explicitly_convertible(std::remove_reference_t<Q>::quantity_spec, Self_{}))
   [[nodiscard]] constexpr Quantity auto operator()(Q&& q) const
   {
     return make_quantity<reference<Self{}, std::remove_cvref_t<Q>::unit>{}>(std::forward<Q>(q).number());
@@ -438,9 +438,6 @@ QUANTITY_SPEC(dimensionless, derived_quantity_spec<>{});
  *
  * Specifies that the provided `Q` should be treated as a quantity kind.
  */
-template<auto Q>
-struct kind_of_;
-
 namespace detail {
 
 template<typename T>
@@ -448,13 +445,21 @@ concept QuantitySpecWithNoSpecifiers = detail::NamedQuantitySpec<T> || detail::I
 
 }  // namespace detail
 
+#ifdef __cpp_explicit_this_parameter
 template<detail::QuantitySpecWithNoSpecifiers auto Q>
   requires(get_kind(Q) == Q)
-#ifdef __cpp_explicit_this_parameter
 struct kind_of_<Q> : Q {
   static constexpr auto _quantity_spec_ = Q;
 };
 #else
+
+#if UNITS_COMP_CLANG
+template<auto Q>
+  requires detail::QuantitySpecWithNoSpecifiers<std::remove_cvref_t<decltype(Q)>> && (get_kind(Q) == Q)
+#else
+template<detail::QuantitySpecWithNoSpecifiers auto Q>
+  requires(get_kind(Q) == Q)
+#endif
 struct kind_of_<Q> : quantity_spec<kind_of_<Q>, Q> {
   static constexpr auto _quantity_spec_ = Q;
 };
@@ -867,8 +872,8 @@ struct extract_results {
 
 #if UNITS_COMP_CLANG
 
-template<typename... Ts>
-extract_results(bool, Ts...) -> extract_results<Ts...>;
+template<QuantitySpec From = struct dimensionless, QuantitySpec To = struct dimensionless, typename Elem = int>
+extract_results(bool, From = {}, To = {}, prepend_rest = {}, Elem = {}) -> extract_results<From, To, Elem>;
 
 #endif
 
diff --git a/test/unit_test/static/quantity_test.cpp b/test/unit_test/static/quantity_test.cpp
index fd8f2170..05858dd9 100644
--- a/test/unit_test/static/quantity_test.cpp
+++ b/test/unit_test/static/quantity_test.cpp
@@ -850,7 +850,7 @@ static_assert(10 * isq::mechanical_energy[J] == 5 * isq::force[N] * (2 * isq::le
 static_assert(1 * si::si2019::speed_of_light_in_vacuum == 299'792'458 * isq::speed[m / s]);
 
 // Different named dimensions
-template<Reference auto R1, Reference auto R2>
+template</*Reference*/ auto R1, /*Reference*/ auto R2>  // TODO Use `Reference` when Clang supports it.
 concept invalid_comparison = !requires { 2 * R1 == 2 * R2; } && !requires { 2 * R2 == 2 * R1; };
 static_assert(invalid_comparison<activity[Bq], isq::frequency[Hz]>);