diff --git a/include/wrenpp/detail/StringCRC32.hpp b/include/wrenpp/detail/StringCRC32.hpp
index 6c3ac8c..fb67598 100644
--- a/include/wrenpp/detail/StringCRC32.hpp
+++ b/include/wrenpp/detail/StringCRC32.hpp
@@ -62,13 +62,13 @@ namespace duckcore {
 		typedef BitArray<0, BitArray<1, BitArray<2, BitArray<4, BitArray<5,
 				BitArray<7, BitArray<8, BitArray<10, BitArray<11, BitArray<12,
 				BitArray<16, BitArray<22, BitArray<23,
-				BitArray<26, nullptr_t> > > > > > > > > > > > > > PolynomialBits;
+				BitArray<26, std::nullptr_t> > > > > > > > > > > > > > PolynomialBits;
 		template <typename P, int M>
 		struct MakePolynomial {
 			enum { value = (1 << (M - P::value)) bitor MakePolynomial<typename P::Next, M>::value };
 		};
 		template <int M>
-		struct MakePolynomial<nullptr_t, M> {
+		struct MakePolynomial<std::nullptr_t, M> {
 			enum { value = 0 };
 		};
 
diff --git a/include/wrenpp/detail/string_bt.hpp b/include/wrenpp/detail/string_bt.hpp
index 6344d4c..689a651 100644
--- a/include/wrenpp/detail/string_bt.hpp
+++ b/include/wrenpp/detail/string_bt.hpp
@@ -56,7 +56,7 @@ namespace dhandy {
 			template <std::size_t S2> constexpr bool operator== (const string<S2, Ch>&) const { return false; }
 
 			template <typename... Args>
-			requires (std::is_same_v<Args, typename string<S, Ch>::value_type> && ...)
+			requires (std::is_same_v<Args, Ch> && ...)
 			constexpr string ( Args... );
 
 			constexpr const value_type (&data_arr() const)[S] { return m_data; }
@@ -110,8 +110,8 @@ namespace dhandy {
 
 		template <std::size_t S, typename Ch>
 		template <typename... Args>
-		requires (std::is_same_v<Args, typename string<S, Ch>::value_type> && ...)
-		inline constexpr string<S, Ch>::string (Args... parArgs) :
+		requires (std::is_same_v<Args, Ch> && ...)
+		constexpr inline string<S, Ch>::string (Args... parArgs) :
 			m_data{parArgs...}
 		{
 		}