diff --git a/src/Uno.UI.RuntimeTests/MUX/Utilities/TestHelpers.cs b/src/Uno.UI.RuntimeTests/MUX/Utilities/TestHelpers.cs
index 5789dc57a6ce..d2c4b46ea435 100644
--- a/src/Uno.UI.RuntimeTests/MUX/Utilities/TestHelpers.cs
+++ b/src/Uno.UI.RuntimeTests/MUX/Utilities/TestHelpers.cs
@@ -104,7 +104,7 @@ public class App
 		public static UIElement TestContentRoot
 		{
 			get => TestServices.WindowHelper.WindowContent;
-			set => TestServices.WindowHelper.WindowContent = value;
+			set => TestServices.WindowHelper.WindowContent = value as UIElement;
 		}
 
 		public static Application Current => Application.Current;
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/CalendarView/CalendarViewGeneratorHost.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/CalendarView/CalendarViewGeneratorHost.cs
index f1814f5e7764..4b178e103514 100644
--- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/CalendarView/CalendarViewGeneratorHost.cs
+++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/CalendarView/CalendarViewGeneratorHost.cs
@@ -353,8 +353,6 @@ internal int CalculateOffsetFromMinDate(DateTime date)
 			long diffInUTC = 0;
 			int diffInUnit = 0;
 
-			int maxEstimationRetryCount = 3; // the max times that we should estimate
-			int maxReboundCount = 3; // the max times that we should reduce the step when the estimation is over the boundary.
 			int minDistanceToEstimate = 3; // the min estimated distance that we should do estimation.
 
 			pCalendar.SetDateTime(estimatedDate);
@@ -363,6 +361,8 @@ internal int CalculateOffsetFromMinDate(DateTime date)
 			// we could need more times (uncommon scenario)
 			var averageTicksPerUnit = GetAverageTicksPerUnit();
 #if DEBUG
+			int maxEstimationRetryCount = 3; // the max times that we should estimate
+			int maxReboundCount = 3; // the max times that we should reduce the step when the estimation is over the boundary.
 			int estimationCount = 0;
 #endif
 			while (true)
diff --git a/src/Uno.UI/UI/Xaml/Controls/Border/BorderLayerRenderer.net.cs b/src/Uno.UI/UI/Xaml/Controls/Border/BorderLayerRenderer.net.cs
new file mode 100644
index 000000000000..9d5bb7694f9c
--- /dev/null
+++ b/src/Uno.UI/UI/Xaml/Controls/Border/BorderLayerRenderer.net.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Linq;
+using Windows.UI.Xaml.Media;
+using Uno.Disposables;
+using Uno.Extensions;
+using Uno.UI.Xaml;
+
+namespace Windows.UI.Xaml.Shapes
+{
+	internal class BorderLayerRenderer
+	{
+		public void UpdateLayer(
+			UIElement element,
+			Brush background,
+			Thickness borderThickness,
+			Brush borderBrush,
+			CornerRadius cornerRadius,
+			object image)
+		{
+		}
+	}
+}
diff --git a/src/Uno.UI/UI/Xaml/Controls/Border/BorderLayerRenderer.wasm.cs b/src/Uno.UI/UI/Xaml/Controls/Border/BorderLayerRenderer.wasm.cs
index f61fc1d8d82e..ee0a4a04e0ee 100644
--- a/src/Uno.UI/UI/Xaml/Controls/Border/BorderLayerRenderer.wasm.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/Border/BorderLayerRenderer.wasm.cs
@@ -160,7 +160,7 @@ public static void SetBackgroundBrush(FrameworkElement element, Brush brush)
 					break;
 				case XamlCompositionBrushBase unsupportedCompositionBrush:
 					var fallbackColor = unsupportedCompositionBrush.FallbackColorWithOpacity;
-					WindowManagerInterop.SetElementBackgroundColor(HtmlId, fallbackColor);
+					WindowManagerInterop.SetElementBackgroundColor(element.HtmlId, fallbackColor);
 					RecalculateBrushOnSizeChanged(element, false);
 					break;
 				default: