diff --git a/Source/Engine/Content/Storage/FlaxStorage.cpp b/Source/Engine/Content/Storage/FlaxStorage.cpp
index 6967bb5ad..362257369 100644
--- a/Source/Engine/Content/Storage/FlaxStorage.cpp
+++ b/Source/Engine/Content/Storage/FlaxStorage.cpp
@@ -286,13 +286,13 @@ FlaxStorage::LockData FlaxStorage::LockSafe()
 
 uint32 FlaxStorage::GetRefCount() const
 {
-    return (uint32)Platform::AtomicRead((int64*)&_refCount);
+    return (uint32)Platform::AtomicRead((intptr*)&_refCount);
 }
 
 bool FlaxStorage::ShouldDispose() const
 {
-    return Platform::AtomicRead((int64*)&_refCount) == 0 &&
-            Platform::AtomicRead((int64*)&_chunksLock) == 0 &&
+    return Platform::AtomicRead((intptr*)&_refCount) == 0 &&
+            Platform::AtomicRead((intptr*)&_chunksLock) == 0 &&
             Platform::GetTimeSeconds() - _lastRefLostTime >= 0.5; // TTL in seconds
 }
 
diff --git a/Source/Engine/Content/Storage/FlaxStorage.h b/Source/Engine/Content/Storage/FlaxStorage.h
index f01384b68..6acc91981 100644
--- a/Source/Engine/Content/Storage/FlaxStorage.h
+++ b/Source/Engine/Content/Storage/FlaxStorage.h
@@ -87,10 +87,10 @@ public:
 
 protected:
     // State
-    int64 _refCount = 0;
-    int64 _chunksLock = 0;
-    int64 _files = 0;
-    int64 _isUnloadingData = 0;
+    intptr _refCount = 0;
+    intptr _chunksLock = 0;
+    intptr _files = 0;
+    intptr _isUnloadingData = 0;
     double _lastRefLostTime;
     CriticalSection _loadLocker;
 
diff --git a/Source/Engine/Core/Compiler.h b/Source/Engine/Core/Compiler.h
index 46060bca9..18381995b 100644
--- a/Source/Engine/Core/Compiler.h
+++ b/Source/Engine/Core/Compiler.h
@@ -112,7 +112,7 @@
 #define DEPRECATED(...) _DEPRECATED(, ##__VA_ARGS__, _DEPRECATED_1(__VA_ARGS__), _DEPRECATED_0())
 
 #if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND)
-#define HAS_EXCEPTIONS
+#define HAS_EXCEPTIONS 1
 #endif
 
 // C++ 17
diff --git a/Source/Engine/Graphics/Models/SkeletonData.h b/Source/Engine/Graphics/Models/SkeletonData.h
index 79e0be512..3665329b1 100644
--- a/Source/Engine/Graphics/Models/SkeletonData.h
+++ b/Source/Engine/Graphics/Models/SkeletonData.h
@@ -74,7 +74,7 @@ struct TIsPODType<SkeletonBone>
 class FLAXENGINE_API SkeletonData
 {
 private:
-    mutable volatile int64 _dirty = 1;
+    mutable volatile intptr _dirty = 1;
     mutable Array<Matrix> _cachedPose;
 
 public:
diff --git a/Source/Engine/Particles/Particles.cpp b/Source/Engine/Particles/Particles.cpp
index 7d3703ee0..0653f31e8 100644
--- a/Source/Engine/Particles/Particles.cpp
+++ b/Source/Engine/Particles/Particles.cpp
@@ -41,7 +41,7 @@ PACK_STRUCT(struct SpriteParticleVertex
 class SpriteParticleRenderer
 {
 public:
-    volatile int64 Ready = 0;
+    volatile intptr Ready = 0;
     GPUBuffer* VB = nullptr;
     GPUBuffer* IB = nullptr;
     const static int32 VertexCount = 4;
diff --git a/Source/Tools/Flax.Build/Platforms/Web/WebPlatform.cs b/Source/Tools/Flax.Build/Platforms/Web/WebPlatform.cs
index dd1540c5e..f2b67c0e1 100644
--- a/Source/Tools/Flax.Build/Platforms/Web/WebPlatform.cs
+++ b/Source/Tools/Flax.Build/Platforms/Web/WebPlatform.cs
@@ -29,7 +29,7 @@ namespace Flax.Build.Platforms
         public override string ExecutableFileExtension => ".html";
 
         /// <inheritdoc />
-        public override string SharedLibraryFileExtension => ".so";
+        public override string SharedLibraryFileExtension => ".wasm";
 
         /// <inheritdoc />
         public override string StaticLibraryFileExtension => ".a";