diff --git a/src/Loaders/GoldSrcFileBuf.cpp b/src/Loaders/GoldSrcFileBuf.cpp
index 805ce40..b3ccfb7 100644
--- a/src/Loaders/GoldSrcFileBuf.cpp
+++ b/src/Loaders/GoldSrcFileBuf.cpp
@@ -67,7 +67,7 @@ namespace MetaAudio
     }
 
     FILESYSTEM_ANY_SEEK(mFile, static_cast<int>(offset), seekType);
-    auto curPosition = g_pFileSystem->Tell(mFile);
+    auto curPosition = FILESYSTEM_ANY_TELL(mFile);
 
     setg(nullptr, nullptr, nullptr);
     return curPosition;
diff --git a/src/Loaders/SteamAudioMapMeshLoader.cpp b/src/Loaders/SteamAudioMapMeshLoader.cpp
index 3523abd..f6b97e8 100644
--- a/src/Loaders/SteamAudioMapMeshLoader.cpp
+++ b/src/Loaders/SteamAudioMapMeshLoader.cpp
@@ -4,6 +4,8 @@
 #include "Utilities/VectorUtils.hpp"
 #include "Loaders/SteamAudioMapMeshLoader.hpp"
 
+extern int g_iEngineType;
+
 namespace MetaAudio
 {
   constexpr const float EPSILON = 0.000001f;
@@ -67,13 +69,26 @@ namespace MetaAudio
 
         for (int i = 0; i < mapModel->nummodelsurfaces; ++i)
         {
-          auto surface = mapModel->surfaces[mapModel->firstmodelsurface + i];
-          glpoly_t* poly = surface.polys;
+          glpoly_t* firstPoly = nullptr;
+          if (g_iEngineType == ENGINE_GOLDSRC_HL25)
+          {
+              msurface_hl25_t* surfaces = reinterpret_cast<msurface_hl25_t*>(mapModel->surfaces);
+              msurface_hl25_t* surface = &surfaces[mapModel->firstmodelsurface + i];
+              firstPoly = surface->polys;
+          }
+          else
+          {
+              msurface_t* surface = &mapModel->surfaces[mapModel->firstmodelsurface + i];
+              firstPoly = surface->polys;
+          }
           std::vector<alure::Vector3> surfaceVerts;
+          glpoly_t* poly = firstPoly;
           while (poly)
           {
             if (poly->numverts <= 0)
+            {
               continue;
+            }
 
             for (int j = 0; j < poly->numverts; ++j)
             {
@@ -83,8 +98,10 @@ namespace MetaAudio
             poly = poly->next;
 
             // escape rings
-            if (poly == surface.polys)
+            if (poly == firstPoly)
+            {
               break;
+            }
           }
 
           // triangulation