diff --git a/src/cpp/web-ifc/geometry/representation/IfcGeometry.cpp b/src/cpp/web-ifc/geometry/representation/IfcGeometry.cpp
index ee182e6e..63e0459a 100644
--- a/src/cpp/web-ifc/geometry/representation/IfcGeometry.cpp
+++ b/src/cpp/web-ifc/geometry/representation/IfcGeometry.cpp
@@ -210,7 +210,7 @@ namespace webifc::geometry {
 		return  resultMat;
 	}
 
-	uint32_t IfcGeometry::GetVertexData()
+	uintptr_t IfcGeometry::GetVertexData()
 	{
 		// unfortunately webgl can't do doubles
 		if (fvertexData.size() != vertexData.size())
@@ -228,7 +228,7 @@ namespace webifc::geometry {
 		{
 			return 0;
 		}
-		return (uint32_t)(size_t)&fvertexData[0];
+		return (uintptr_t)(size_t)&fvertexData[0];
 	}
 
     uint32_t IfcGeometry::GetVertexDataSize()
@@ -236,9 +236,9 @@ namespace webifc::geometry {
 		return (uint32_t)fvertexData.size();
 	}
 
-	uint32_t IfcGeometry::GetIndexData()
+	uintptr_t IfcGeometry::GetIndexData()
 	{
-		return (uint32_t)(size_t)&indexData[0];
+		return (uintptr_t)(size_t)&indexData[0];
 	}
 
 	uint32_t IfcGeometry::GetIndexDataSize()
diff --git a/src/cpp/web-ifc/geometry/representation/IfcGeometry.h b/src/cpp/web-ifc/geometry/representation/IfcGeometry.h
index 54f3ef44..3ad62652 100644
--- a/src/cpp/web-ifc/geometry/representation/IfcGeometry.h
+++ b/src/cpp/web-ifc/geometry/representation/IfcGeometry.h
@@ -60,9 +60,9 @@ namespace webifc::geometry {
 		void AddPart(Geometry geom);
 		void AddGeometry(Geometry geom, glm::dmat4 trans = glm::dmat4(1), double scx = 1, double scy = 1, double scz = 1, glm::dvec3 origin = glm::dvec3(0, 0, 0));
 		void MergeGeometry(Geometry geom);
-		uint32_t GetVertexData();
+		uintptr_t GetVertexData();
 		uint32_t GetVertexDataSize();
-		uint32_t GetIndexData();
+		uintptr_t GetIndexData();
 		uint32_t GetIndexDataSize();
 		SweptDiskSolid GetSweptDiskSolid();
 		glm::dmat4 Normalize();
diff --git a/src/cpp/web-ifc/parsing/IfcFileStream.cpp b/src/cpp/web-ifc/parsing/IfcFileStream.cpp
index e46357df..3a2719be 100644
--- a/src/cpp/web-ifc/parsing/IfcFileStream.cpp
+++ b/src/cpp/web-ifc/parsing/IfcFileStream.cpp
@@ -14,7 +14,10 @@
 
    IfcTokenStream::IfcFileStream::~IfcFileStream() 
    {
-    delete _buffer;
+    if (_buffer != nullptr) {
+      delete[] _buffer;
+      _buffer = nullptr;
+    }
    }
    
    void IfcTokenStream::IfcFileStream::load()
diff --git a/src/cpp/web-ifc/parsing/IfcTokenChunk.cpp b/src/cpp/web-ifc/parsing/IfcTokenChunk.cpp
index 2aa797dd..016d44cb 100644
--- a/src/cpp/web-ifc/parsing/IfcTokenChunk.cpp
+++ b/src/cpp/web-ifc/parsing/IfcTokenChunk.cpp
@@ -19,7 +19,7 @@ namespace webifc::parsing
   bool IfcTokenStream::IfcTokenChunk::Clear(bool force)
   {
     if (_fileStream==nullptr && !force) return false; 
-    if (_chunkData!=nullptr) delete[] _chunkData;
+    if (_chunkData!=nullptr) { delete[] _chunkData; _chunkData = nullptr; }
     _loaded=false;
     return true;
   }