diff --git a/rts/Lua/LuaTextures.cpp b/rts/Lua/LuaTextures.cpp
index 8d3a083dbef..0ae691d63c0 100644
--- a/rts/Lua/LuaTextures.cpp
+++ b/rts/Lua/LuaTextures.cpp
@@ -90,7 +90,9 @@ std::string LuaTextures::Create(const Texture& tex)
 		} break;
 	}
 
-	if (glGetError() != GL_NO_ERROR) {
+	if (const GLenum texErr = glGetError(); texErr != GL_NO_ERROR) {
+		LOG_L(L_ERROR, "[LuaTextures::%s] glTexImage failed: target=0x%x size=%dx%d fmt=0x%x dataFmt=0x%x dataType=0x%x border=%d glError=0x%x",
+			__func__, tex.target, tex.xsize, tex.ysize, tex.format, dataFormat, dataType, tex.border, texErr);
 		glDeleteTextures(1, &texID);
 		glBindTexture(tex.target, currentBinding);
 		return "";
diff --git a/rts/Rml/SolLua/bind/Context.cpp b/rts/Rml/SolLua/bind/Context.cpp
index db0dcb8960b..bd40fd4e535 100644
--- a/rts/Rml/SolLua/bind/Context.cpp
+++ b/rts/Rml/SolLua/bind/Context.cpp
@@ -131,7 +131,7 @@ struct lua_iterator_state
 			sol::state_view l{s};
 			int index = 0;
 			int count = keytable.size();
-			while (keytable.get<sol::object>(++index).get_type() != sol::type::nil && index <= count) {
+			while (keytable.get<sol::object>(++index).get_type() != sol::type::lua_nil && index <= count) {
 				this->keys.emplace_back(sol::object(l, sol::in_place, index));
 			}
 		} else {
@@ -199,7 +199,7 @@ createNewIndexFunction(std::shared_ptr<Rml::SolLua::SolLuaDataModel> data, const
 		}
 		if (value.is<sol::table>()) {
 			auto value_raw = value.as<sol::table>().raw_get<sol::object>("__raw");
-			if (value_raw != sol::nil && value_raw.is<sol::function>()) {
+			if (value_raw != sol::lua_nil && value_raw.is<sol::function>()) {
 				// new value is a datamodel proxy, so get the underlying table to assign
 				prop.as<sol::table>().raw_set(solkey, value_raw.as<sol::function>().call<sol::object>(value));
 			} else {
@@ -290,7 +290,7 @@ sol::table openDataModel(Rml::Context& self, const Rml::String& name, sol::objec
 			}
 			if (value.is<sol::table>()) {
 				auto value_raw = value.as<sol::table>().raw_get<sol::object>("__raw");
-				if (value_raw != sol::nil && value_raw.is<sol::function>()) {
+				if (value_raw != sol::lua_nil && value_raw.is<sol::function>()) {
 					// new value is a datamodel proxy, so get the underlying table to assign
 					data->Table.raw_set(key, value_raw.as<sol::function>().call<sol::object>(value));
 				} else {
diff --git a/rts/Rml/SolLua/bind/Element.cpp b/rts/Rml/SolLua/bind/Element.cpp
index e2edf19159a..3bf3ecc7fea 100644
--- a/rts/Rml/SolLua/bind/Element.cpp
+++ b/rts/Rml/SolLua/bind/Element.cpp
@@ -158,7 +158,7 @@ namespace Rml::SolLua
 
 			void Set(const sol::this_state L, const std::string& name, const sol::object& value)
 			{
-				if (value.get_type() == sol::type::nil) {
+				if (value.get_type() == sol::type::lua_nil) {
 					m_element->RemoveProperty(name);
 					return;
 				}
diff --git a/rts/Rml/SolLua/bind/bind.cpp b/rts/Rml/SolLua/bind/bind.cpp
index 21eabe9d46c..98ce9fec37c 100644
--- a/rts/Rml/SolLua/bind/bind.cpp
+++ b/rts/Rml/SolLua/bind/bind.cpp
@@ -39,7 +39,7 @@ namespace Rml::SolLua
 
 	sol::object makeObjectFromVariant(const Rml::Variant* variant, sol::state_view s)
 	{
-		if (!variant) return sol::make_object(s, sol::nil);
+		if (!variant) return sol::make_object(s, sol::lua_nil);
 
 		switch (variant->GetType())
 		{
@@ -69,10 +69,10 @@ namespace Rml::SolLua
 		case Rml::Variant::VOIDPTR:
 			return sol::make_object(s, variant->Get<void*>());
 		default:
-			return sol::make_object(s, sol::nil);
+			return sol::make_object(s, sol::lua_nil);
 		}
 
-		return sol::make_object(s, sol::nil);
+		return sol::make_object(s, sol::lua_nil);
 	}
 
 } // end namespace Rml::SolLua
diff --git a/rts/System/SafeUtil.h b/rts/System/SafeUtil.h
index ce19b3f9738..9fbf946cc82 100644
--- a/rts/System/SafeUtil.h
+++ b/rts/System/SafeUtil.h
@@ -5,6 +5,8 @@
 
 #include <limits>
 #include <cstring>
+#include <type_traits>
+#include <memory>
 
 namespace spring {
 	template<class T> inline void SafeDestruct(T*& p)
@@ -112,8 +114,8 @@ namespace spring {
         static_assert(sizeof(TIn) == sizeof(TOut), "Types must match sizes");
         static_assert(std::is_trivially_copyable<TIn>::value , "Requires TriviallyCopyable input");
         static_assert(std::is_trivially_copyable<TOut>::value, "Requires TriviallyCopyable output");
-        static_assert(std::is_trivially_constructible_v<TOut>,
-            "This implementation additionally requires destination type to be trivially constructible");
+        static_assert(std::is_trivially_default_constructible<TOut>::value,
+            "This implementation additionally requires destination type to be trivially default-constructible");
 
         TOut t2;
         std::memcpy(std::addressof(t2), std::addressof(t1), sizeof(TIn));
diff --git a/rts/System/float3.h b/rts/System/float3.h
index f096c112c0d..bf47dd90c2a 100644
--- a/rts/System/float3.h
+++ b/rts/System/float3.h
@@ -9,7 +9,6 @@
 #include <format>
 
 #include "System/BranchPrediction.h"
-#include "lib/streflop/streflop_cond.h"
 #include "System/creg/creg_cond.h"
 #include "System/FastMath.h"
 #include "System/type2.h"