diff --git a/src/Calculator.Shared/App.xaml.cs b/src/Calculator.Shared/App.xaml.cs
index bf38c091..17dff6c9 100644
--- a/src/Calculator.Shared/App.xaml.cs
+++ b/src/Calculator.Shared/App.xaml.cs
@@ -34,6 +34,10 @@ namespace CalculatorApp
         /// </summary>
         public App()
 		{
+#if HAS_UNO
+			ConfigureFilters(Uno.Extensions.LogExtensionPoint.AmbientLoggerFactory);
+#endif
+
 			this.InitializeComponent();
 			this.Suspending += OnSuspending;
         }
@@ -91,10 +95,52 @@ namespace CalculatorApp
 			}
 		}
 
-        /// <summary>
-        /// Return True if animation is enabled by user setting.
-        /// </summary>
-        public static bool IsAnimationEnabled()
+#if HAS_UNO
+		static void ConfigureFilters(Microsoft.Extensions.Logging.ILoggerFactory factory)
+		{
+#if DEBUG
+			factory
+				.WithFilter(new Microsoft.Extensions.Logging.FilterLoggerSettings
+					{
+						{ "Uno", LogLevel.Warning },
+						{ "Windows", LogLevel.Warning },
+						
+						// Generic Xaml events
+						//{ "Windows.UI.Xaml", LogLevel.Debug },
+						// { "Windows.UI.Xaml.Shapes", LogLevel.Debug },
+						//{ "Windows.UI.Xaml.VisualStateGroup", LogLevel.Debug },
+						//{ "Windows.UI.Xaml.StateTriggerBase", LogLevel.Debug },
+						// { "Windows.UI.Xaml.UIElement", LogLevel.Debug },
+						// { "Windows.UI.Xaml.Setter", LogLevel.Debug },
+						   
+						// Layouter specific messages
+						// { "Windows.UI.Xaml.Controls", LogLevel.Debug },
+						//{ "Windows.UI.Xaml.Controls.Layouter", LogLevel.Debug },
+						//{ "Windows.UI.Xaml.Controls.Panel", LogLevel.Debug },
+						   
+						// Binding related messages
+						// { "Windows.UI.Xaml.Data", LogLevel.Debug },
+						// { "Windows.UI.Xamll.Data", LogLevel.Debug },
+						   
+						//  Binder memory references tracking
+						// { "ReferenceHolder", LogLevel.Debug },
+					}
+				)
+				.AddConsole(LogLevel.Trace);
+#else
+#if !__WASM__
+			factory
+				.AddConsole(LogLevel.Error);
+#endifs
+#endif
+		}
+#endif
+
+
+		/// <summary>
+		/// Return True if animation is enabled by user setting.
+		/// </summary>
+		public static bool IsAnimationEnabled()
         {
             return m_isAnimationEnabled;
         }
diff --git a/src/Calculator.Wasm/Calculator.Wasm.csproj b/src/Calculator.Wasm/Calculator.Wasm.csproj
index 77f13551..9a295d9f 100644
--- a/src/Calculator.Wasm/Calculator.Wasm.csproj
+++ b/src/Calculator.Wasm/Calculator.Wasm.csproj
@@ -33,6 +33,13 @@
 		<Compile Include="Program.cs" />
 		<Content Include="LinkerConfig.xml" />
 	</ItemGroup>
+	
+	<ItemGroup>
+		<WasmShellMonoEnvironment Include="MONO_GC_PARAMS" Value="soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep" />
+		<WasmShellMonoEnvironment Include="MONO_LOG_LEVEL" Value="debug" />
+		<WasmShellMonoEnvironment Include="MONO_LOG_MASK" Value="gc" />
+	</ItemGroup>
+	
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
diff --git a/src/Calculator.Wasm/Program.cs b/src/Calculator.Wasm/Program.cs
index 40b01b4c..f6e3e9b9 100644
--- a/src/Calculator.Wasm/Program.cs
+++ b/src/Calculator.Wasm/Program.cs
@@ -14,45 +14,7 @@ namespace WindowsCalculator.Wasm
 		{
 			Console.WriteLine("Program.Main");
 
-			ConfigureFilters(LogExtensionPoint.AmbientLoggerFactory);
-
             Windows.UI.Xaml.Application.Start(_ => _app = new App());
 		}
-        static void ConfigureFilters(ILoggerFactory factory)
-        {
-#if DEBUG
-			factory
-				.WithFilter(new FilterLoggerSettings
-					{
-						{ "Uno", LogLevel.Warning },
-						{ "Windows", LogLevel.Warning },
-						
-						// Generic Xaml events
-						//{ "Windows.UI.Xaml", LogLevel.Debug },
-						// { "Windows.UI.Xaml.Shapes", LogLevel.Debug },
-						//{ "Windows.UI.Xaml.VisualStateGroup", LogLevel.Debug },
-						//{ "Windows.UI.Xaml.StateTriggerBase", LogLevel.Debug },
-						// { "Windows.UI.Xaml.UIElement", LogLevel.Debug },
-						// { "Windows.UI.Xaml.Setter", LogLevel.Debug },
-						   
-						// Layouter specific messages
-						// { "Windows.UI.Xaml.Controls", LogLevel.Debug },
-						//{ "Windows.UI.Xaml.Controls.Layouter", LogLevel.Debug },
-						//{ "Windows.UI.Xaml.Controls.Panel", LogLevel.Debug },
-						   
-						// Binding related messages
-						// { "Windows.UI.Xaml.Data", LogLevel.Debug },
-						// { "Windows.UI.Xamll.Data", LogLevel.Debug },
-						   
-						//  Binder memory references tracking
-						// { "ReferenceHolder", LogLevel.Debug },
-					}
-				)
-				.AddConsole(LogLevel.Trace);
-#else
-            factory
-                .AddConsole(LogLevel.Error);
-#endif
-        }
     }
 }
diff --git a/src/Calculator.iOS/Calculator.iOS.csproj b/src/Calculator.iOS/Calculator.iOS.csproj
index ce4e5ae5..9cbedb92 100644
--- a/src/Calculator.iOS/Calculator.iOS.csproj
+++ b/src/Calculator.iOS/Calculator.iOS.csproj
@@ -191,7 +191,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Uno.UI" Version="1.45.0-dev.1550" />
-  </ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
+	</ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'iPhoneSimulator' ">
     <NativeReference Include="NativeReferences/x86_64/libCalcManager.a">
       <Kind>Static</Kind>
@@ -204,4 +206,4 @@
   </ItemGroup>
   <Import Project="..\Calculator.Shared\Calculator.Shared.projitems" Label="Shared" Condition="Exists('..\Calculator.Shared\Calculator.Shared.projitems')" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>