diff --git a/src/CalcManager/CCalcManager.cpp b/src/CalcManager/CCalcManager.cpp
index efb1e834..1663554c 100644
--- a/src/CalcManager/CCalcManager.cpp
+++ b/src/CalcManager/CCalcManager.cpp
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <iostream>
 
-#if !DEBUG
+#if DEBUG
 #if defined(_WINDOWS_)
 #include <Windows.h>
 #include <strsafe.h>
diff --git a/src/Calculator.Wasm/WasmScripts/AppManifest.js b/src/Calculator.Wasm/WasmScripts/AppManifest.js
index bb8fff30..87d7f7ca 100644
--- a/src/Calculator.Wasm/WasmScripts/AppManifest.js
+++ b/src/Calculator.Wasm/WasmScripts/AppManifest.js
@@ -2,6 +2,6 @@
 
     splashScreenImage: "Assets/SplashScreen.scale-200.png",
     splashScreenColor: "#00f",
-    displayName: "WindowsCalculator"
+    displayName: "Calculator"
 
 }
diff --git a/src/Calculator.Wasm/WasmScripts/CalcManager.js b/src/Calculator.Wasm/WasmScripts/CalcManager.js
index e3c5ac1e..fe4fdf17 100644
--- a/src/Calculator.Wasm/WasmScripts/CalcManager.js
+++ b/src/Calculator.Wasm/WasmScripts/CalcManager.js
@@ -22,8 +22,8 @@
         var fMaxDigitsReachedCallback       = Module.addFunction((state) => _maxDigitsReachedCallback(state), 'vii');
         var fMemoryItemChangedCallback      = Module.addFunction((state, indexOfMemory) => _memoryItemChangedCallback(state, indexOfMemory), 'vii');
         var fOnHistoryItemAddedCallback     = Module.addFunction((state, addedItemIndex) => _onHistoryItemAddedCallback(state, addedItemIndex), 'vii');
-        var fOnNoRightParenAddedCallback    = Module.addFunction((state) => _onNoRightParenAddedCallback    (state), 'vi');
-        var fSetExpressionDisplayCallback   = Module.addFunction((state) => _setExpressionDisplayCallback   (state), 'vi');
+        var fOnNoRightParenAddedCallback    = Module.addFunction((state) => _onNoRightParenAddedCallback(state), 'vi');
+        var fSetExpressionDisplayCallback   = Module.addFunction((state, historyItem) => _setExpressionDisplayCallback(state, historyItem), 'vii');
         var fSetMemorizedNumbersCallback    = Module.addFunction((state, size, numbers) => _setMemorizedNumbersCallback(state, size, numbers), 'viii');
 
         var ret = `${fGetCEngineStringCallback};`