diff --git a/examples/source/docs/std_thread.cpp b/examples/source/docs/std_thread.cpp
index 3c15f80b..6b8a30c2 100644
--- a/examples/source/docs/std_thread.cpp
+++ b/examples/source/docs/std_thread.cpp
@@ -23,7 +23,7 @@ struct worker_data {
 };
 
 void worker_thread(worker_data& data) {
-	for (std::uint64_t loops = 0; true; ++loops) {
+	for ([[maybe_unused]] std::uint64_t loops = 0; true; ++loops) {
 		// Wait until main() sends data
 		std::unique_lock<std::mutex> data_lock(
 		     data.until_ready_mutex);
diff --git a/include/sol/stack_check_unqualified.hpp b/include/sol/stack_check_unqualified.hpp
index f0aaa011..37c220bb 100644
--- a/include/sol/stack_check_unqualified.hpp
+++ b/include/sol/stack_check_unqualified.hpp
@@ -582,7 +582,7 @@ namespace sol { namespace stack {
 	template <typename T, std::size_t N, type expect>
 	struct unqualified_checker<exhaustive_until<T, N>, expect> {
 		template <typename K, typename V, typename Handler>
-		static bool check_two(types<K, V>, lua_State* arg_L, int index, type indextype, Handler&& handler, record& tracking) {
+		static bool check_two(types<K, V>, lua_State* arg_L, int relindex, type indextype, Handler&& handler, record& tracking) {
 			tracking.use(1);
 
 #if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
diff --git a/include/sol/types.hpp b/include/sol/types.hpp
index 9fd300ec..204516a2 100644
--- a/include/sol/types.hpp
+++ b/include/sol/types.hpp
@@ -39,6 +39,7 @@
 #include <initializer_list>
 #include <string>
 #include <string_view>
+#include <limits>
 #include <optional>
 #include <memory>
 #if SOL_IS_ON(SOL_STD_VARIANT)
@@ -494,7 +495,7 @@ namespace sol {
 	};
 
 	template <typename T>
-	using exhaustive = exhaustive_until<T, std::numeric_limits<size_t>::max()>;
+	using exhaustive = exhaustive_until<T, (std::numeric_limits<size_t>::max)()>;
 
 	template <typename T>
 	struct non_exhaustive : private detail::ebco<T> {