diff --git a/src/cpp/web-ifc/geometry/operations/boolean-utils/shared-position.h b/src/cpp/web-ifc/geometry/operations/boolean-utils/shared-position.h
index 9287ad510..eff752325 100644
--- a/src/cpp/web-ifc/geometry/operations/boolean-utils/shared-position.h
+++ b/src/cpp/web-ifc/geometry/operations/boolean-utils/shared-position.h
@@ -226,7 +226,7 @@ namespace fuzzybools
 
         auto GetSegments() const
         {
-            const auto makeSegments = [&](int i)
+            const auto makeSegments = [&](size_t i)
             {
                 return std::make_pair(points[i - 1].second, points[i].second);
             };
diff --git a/src/cpp/web-ifc/modelmanager/ModelManager.cpp b/src/cpp/web-ifc/modelmanager/ModelManager.cpp
index 98ad46f3c..f828b81c3 100644
--- a/src/cpp/web-ifc/modelmanager/ModelManager.cpp
+++ b/src/cpp/web-ifc/modelmanager/ModelManager.cpp
@@ -70,7 +70,10 @@ webifc::parsing::IfcLoader *webifc::manager::ModelManager::GetIfcLoader(uint32_t
 const webifc::manager::LoaderSettings &webifc::manager::ModelManager::GetSettings(uint32_t modelID) const
 {
     if (!IsModelOpen(modelID))
-        return LoaderSettings();
+    {
+        static const LoaderSettings defaultSettings;
+        return defaultSettings;
+    }
     return _settings[modelID];
 }
 
diff --git a/src/cpp/web-ifc/parsing/IfcTokenStream.cpp b/src/cpp/web-ifc/parsing/IfcTokenStream.cpp
index f93beb48a..5d8b49a8f 100644
--- a/src/cpp/web-ifc/parsing/IfcTokenStream.cpp
+++ b/src/cpp/web-ifc/parsing/IfcTokenStream.cpp
@@ -55,10 +55,10 @@ namespace webifc::parsing
       return true;
   }
 
-  bool IfcTokenStream::SetTokenSource(std::istream &requestData)
-  { 
-     return SetTokenSource([&](char* dest, size_t sourceOffset, size_t destSize) { requestData.seekg(sourceOffset); requestData.read(dest, destSize); return requestData.gcount();},true);
-  }
+bool IfcTokenStream::SetTokenSource(std::istream &requestData)
+{ 
+   return SetTokenSource([&](char* dest, size_t sourceOffset, size_t destSize) { requestData.seekg(sourceOffset); requestData.read(dest, destSize); return static_cast<uint32_t>(requestData.gcount());},true);
+}
   
   std::string_view IfcTokenStream::ReadString() 
   {