diff --git a/SampleApps/UniversalApp/MainPage.xaml b/SampleApps/UniversalApp/MainPage.xaml
index fa58916a..cf0e5a38 100644
--- a/SampleApps/UniversalApp/MainPage.xaml
+++ b/SampleApps/UniversalApp/MainPage.xaml
@@ -5,10 +5,6 @@
     xmlns:map="using:MapControl"
     xmlns:local="using:SampleApplication">
 
-    <Page.DataContext>
-        <local:MapViewModel/>
-    </Page.DataContext>
-
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <Grid.Resources>
             <DataTemplate x:Key="PolylineItemTemplate">
@@ -84,6 +80,10 @@
             </Style>
         </Grid.Resources>
 
+        <Grid.DataContext>
+            <local:MapViewModel/>
+        </Grid.DataContext>
+
         <map:Map x:Name="map"
                  MinZoomLevel="2" MaxZoomLevel="21" ZoomLevel="11" ManipulationMode="All"
                  MapLayer="{Binding MapLayers[OpenStreetMap]}"
diff --git a/SampleApps/WinUiApp/MainWindow.xaml b/SampleApps/WinUiApp/MainWindow.xaml
index c0acaaac..f90989ca 100644
--- a/SampleApps/WinUiApp/MainWindow.xaml
+++ b/SampleApps/WinUiApp/MainWindow.xaml
@@ -88,7 +88,6 @@
         <map:Map x:Name="map"
                  MinZoomLevel="2" MaxZoomLevel="21" ZoomLevel="11" MouseWheelZoomDelta="1"
                  MapLayer="{Binding MapLayers[OpenStreetMap]}"
-                 ViewportChanged="MapViewportChanged"
                  PointerMoved="MapPointerMoved"
                  PointerExited="MapPointerExited">
             <map:Map.Center>
@@ -113,7 +112,8 @@
         </map:Map>
 
         <Border HorizontalAlignment="Right" VerticalAlignment="Bottom" Background="#AFFFFFFF">
-            <TextBlock Margin="4,2" FontSize="10" local:HyperlinkText.InlinesSource="{Binding MapLayer.Description, ElementName=map}"/>
+            <TextBlock Margin="4,2" FontSize="10"
+                       local:HyperlinkText.InlinesSource="{Binding MapLayer.Description, ElementName=map}"/>
         </Border>
 
         <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top" Margin="6">
diff --git a/SampleApps/WinUiApp/MainWindow.xaml.cs b/SampleApps/WinUiApp/MainWindow.xaml.cs
index b0a01166..3b9853b6 100644
--- a/SampleApps/WinUiApp/MainWindow.xaml.cs
+++ b/SampleApps/WinUiApp/MainWindow.xaml.cs
@@ -53,11 +53,6 @@ namespace SampleApplication
             await ((ImageFileCache)TileImageLoader.Cache).Clean();
         }
 
-        private void MapViewportChanged(object sender, ViewportChangedEventArgs e)
-        {
-            GC.Collect();
-        }
-
         private void MapPointerMoved(object sender, PointerRoutedEventArgs e)
         {
             var location = map.ViewToLocation(e.GetCurrentPoint(map).Position);
diff --git a/SampleApps/WpfApplication/MainWindow.xaml b/SampleApps/WpfApplication/MainWindow.xaml
index b25594b4..38ce527a 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml
+++ b/SampleApps/WpfApplication/MainWindow.xaml
@@ -104,7 +104,8 @@
             <local:MapViewModel/>
         </Grid.DataContext>
         
-        <map:Map x:Name="map" ZoomLevel="11" MaxZoomLevel="21" MouseWheelZoomDelta="1"
+        <map:Map x:Name="map"
+                 MinZoomLevel="2" MaxZoomLevel="21" ZoomLevel="11" MouseWheelZoomDelta="1"
                  Center="53.5,8.2"
                  MapLayer="{Binding MapLayers[OpenStreetMap]}"
                  MouseLeftButtonDown="MapMouseLeftButtonDown"