diff --git a/rts/Rendering/IconHandler.h b/rts/Rendering/IconHandler.h
index 6c67749d739..ec0e5bce6e3 100644
--- a/rts/Rendering/IconHandler.h
+++ b/rts/Rendering/IconHandler.h
@@ -13,7 +13,7 @@
 #include "Rendering/GL/RenderBuffersFwd.h"
 #include "Rendering/Textures/TextureAtlas.h"
 
-class UnitDef;
+struct UnitDef;
 class CTextureRenderAtlas;
 
 namespace icon {
diff --git a/rts/Sim/Misc/SmoothHeightMesh.h b/rts/Sim/Misc/SmoothHeightMesh.h
index 888686af138..91866ddfb6c 100644
--- a/rts/Sim/Misc/SmoothHeightMesh.h
+++ b/rts/Sim/Misc/SmoothHeightMesh.h
@@ -22,7 +22,7 @@ namespace SmoothHeightMeshNamespace {
  */
 class SmoothHeightMesh
 {
-	friend class SmoothHeightMeshDrawer;
+	friend struct SmoothHeightMeshDrawer;
 
 public:
 
diff --git a/rts/Sim/MoveTypes/Components/MoveTypesComponents.h b/rts/Sim/MoveTypes/Components/MoveTypesComponents.h
index b0d1d8b4265..fa7380707bb 100644
--- a/rts/Sim/MoveTypes/Components/MoveTypesComponents.h
+++ b/rts/Sim/MoveTypes/Components/MoveTypesComponents.h
@@ -7,8 +7,8 @@
 #include "System/Ecs/Components/BaseComponents.h"
 #include <System/Threading/ThreadPool.h>
 
-struct CUnit;
-struct CFeature;
+class CUnit;
+class CFeature;
 
 namespace MoveTypes {
 
diff --git a/rts/Sim/MoveTypes/MoveDefHandler.h b/rts/Sim/MoveTypes/MoveDefHandler.h
index fbec124d13c..9c8d1db5601 100644
--- a/rts/Sim/MoveTypes/MoveDefHandler.h
+++ b/rts/Sim/MoveTypes/MoveDefHandler.h
@@ -18,7 +18,7 @@ class CUnit;
 class LuaTable;
 
 namespace MoveTypes {
-	class CheckCollisionQuery;
+	struct CheckCollisionQuery;
 }
 
 namespace MoveDefs {
diff --git a/rts/Sim/MoveTypes/Utils/UnitTrapCheckUtils.h b/rts/Sim/MoveTypes/Utils/UnitTrapCheckUtils.h
index 7db24ab3835..da7354b01fb 100644
--- a/rts/Sim/MoveTypes/Utils/UnitTrapCheckUtils.h
+++ b/rts/Sim/MoveTypes/Utils/UnitTrapCheckUtils.h
@@ -3,8 +3,8 @@
 #ifndef UNIT_TRAP_CHECK_UTILS_H__
 #define UNIT_TRAP_CHECK_UTILS_H__
 
-struct CFeature;
-struct CUnit;
+class CFeature;
+class CUnit;
 
 namespace MoveTypes {
     void RegisterFeatureForUnitTrapCheck(CFeature* object);
diff --git a/rts/Sim/Path/HAPFS/PathSearch.h b/rts/Sim/Path/HAPFS/PathSearch.h
index 1fae37cc5dd..fdb3bfc7d85 100644
--- a/rts/Sim/Path/HAPFS/PathSearch.h
+++ b/rts/Sim/Path/HAPFS/PathSearch.h
@@ -6,7 +6,7 @@
 #include "System/float3.h"
 
 class CSolidObject;
-class MoveDef;
+struct MoveDef;
 
 namespace HAPFS {
 	struct PathSearch {
diff --git a/rts/Sim/Path/QTPFS/Components/PathSpeedModInfo.h b/rts/Sim/Path/QTPFS/Components/PathSpeedModInfo.h
index 19f7c9285cc..4bde1a878b5 100644
--- a/rts/Sim/Path/QTPFS/Components/PathSpeedModInfo.h
+++ b/rts/Sim/Path/QTPFS/Components/PathSpeedModInfo.h
@@ -12,7 +12,7 @@
 
 namespace QTPFS {
 
-class INode;
+struct INode;
 
 struct NodeLayerSpeedInfoSweep {
 	static constexpr std::size_t page_size = MoveDefHandler::MAX_MOVE_DEFS;
diff --git a/rts/System/FileSystem/FileSystem.cpp b/rts/System/FileSystem/FileSystem.cpp
index d1471810f48..f319d2199ca 100644
--- a/rts/System/FileSystem/FileSystem.cpp
+++ b/rts/System/FileSystem/FileSystem.cpp
@@ -61,7 +61,7 @@ namespace Impl {
 		return std::string(reinterpret_cast<const char*>(utf8.c_str()));
 	}
 	RECOIL_FORCE_INLINE std::string StoreUTF8AsString(const std::u8string_view& utf8) {
-		return std::string(reinterpret_cast<const char*>(utf8.data()));
+		return std::string(reinterpret_cast<const char*>(utf8.data()), utf8.size());
 	}
 	RECOIL_FORCE_INLINE std::string StorePathAsString(const fs::path& path) {
 		return StoreUTF8AsString(path.u8string());