diff --git a/packages/editor-core/src/Services/Build/pipelines/WebBuildPipeline.ts b/packages/editor-core/src/Services/Build/pipelines/WebBuildPipeline.ts
index f6f230a3..1f1f1cd7 100644
--- a/packages/editor-core/src/Services/Build/pipelines/WebBuildPipeline.ts
+++ b/packages/editor-core/src/Services/Build/pipelines/WebBuildPipeline.ts
@@ -1116,6 +1116,10 @@ export class WebBuildPipeline implements IBuildPipeline {
             }
         }
 
+        // Check if WASM engine is available
+        const esEngineDir = `${context.outputDir}/libs/es-engine`;
+        const hasWasm = await fs.pathExists(esEngineDir);
+
         const useBundledModules = webConfig.bundleModules !== false;
         let importMapScript = '';
         let pluginImportCode = '';
diff --git a/packages/shader-editor/package.json b/packages/shader-editor/package.json
index 3f51cde7..a8585743 100644
--- a/packages/shader-editor/package.json
+++ b/packages/shader-editor/package.json
@@ -30,6 +30,7 @@
         "react": "^18.3.1",
         "@types/react": "^18.2.0",
         "lucide-react": "^0.453.0",
+        "zustand": "^5.0.8",
         "rimraf": "^5.0.5",
         "tsup": "^8.0.0",
         "typescript": "^5.3.3"
diff --git a/packages/tilemap-editor/src/components/panels/TilemapEditorPanel.tsx b/packages/tilemap-editor/src/components/panels/TilemapEditorPanel.tsx
index a9a0b0e5..ea1fee36 100644
--- a/packages/tilemap-editor/src/components/panels/TilemapEditorPanel.tsx
+++ b/packages/tilemap-editor/src/components/panels/TilemapEditorPanel.tsx
@@ -594,12 +594,9 @@ export const TilemapEditorPanel: React.FC<TilemapEditorPanelProps> = ({ messageH
         entityId,
         pendingFilePath,
         currentFilePath,
-        currentTool: _currentTool,
         zoom,
         showGrid,
-        showCollision: _showCollision,
-        editingCollision: _editingCollision,
-        tileWidth: _tileWidth,
+        showCollision,
         tileHeight,
         tilesetImageUrl,
         tilesetColumns,
@@ -607,11 +604,9 @@ export const TilemapEditorPanel: React.FC<TilemapEditorPanelProps> = ({ messageH
         setEntityId,
         setPendingFilePath,
         setCurrentFilePath,
-        setCurrentTool: _setCurrentTool,
         setZoom,
         setShowGrid,
         setShowCollision,
-        setEditingCollision: _setEditingCollision,
         setPan,
         setTileset,
         setLayers,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6ec1844b..192ed8c4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1276,6 +1276,9 @@ importers:
       typescript:
         specifier: ^5.3.3
         version: 5.9.3
+      zustand:
+        specifier: ^5.0.8
+        version: 5.0.8(@types/react@18.3.27)(react@18.3.1)(use-sync-external-store@1.6.0(react@18.3.1))
 
   packages/sprite:
     devDependencies: