diff --git a/Directory.Build.props b/Directory.Build.props
index 4a7d8513..298e13bb 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
         <Product>XAML Map Control</Product>
         <Authors>Clemens Fischer</Authors>
         <Copyright>Copyright © 2025 Clemens Fischer</Copyright>
-        <Version>13.0.0</Version>
+        <Version>13.0.1</Version>
         <AssemblyVersion>$(Version)</AssemblyVersion>
         <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
         <SignAssembly>true</SignAssembly>
@@ -11,7 +11,6 @@
         <PackageTags>XAML WPF WinUI Avalonia Map OpenStreetMap</PackageTags>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageProjectUrl>https://github.com/ClemensFischer/XAML-Map-Control</PackageProjectUrl>
-        <EnableMsixTooling>true</EnableMsixTooling>
         <Nullable>disable</Nullable>
     </PropertyGroup>
 </Project>
diff --git a/MBTiles/Shared/MBTileSource.cs b/MBTiles/Shared/MBTileSource.cs
index 2efc02bf..457f3882 100644
--- a/MBTiles/Shared/MBTileSource.cs
+++ b/MBTiles/Shared/MBTileSource.cs
@@ -68,7 +68,9 @@ namespace MapControl.MBTiles
                     command.Parameters.AddWithValue("@x", x);
                     command.Parameters.AddWithValue("@y", (1 << zoomLevel) - y - 1);
 
-                    image = await LoadImageAsync((byte[])await command.ExecuteScalarAsync());
+                    var buffer = (byte[])await command.ExecuteScalarAsync();
+
+                    image = await LoadImageAsync(buffer);
                 }
             }
             catch (Exception ex)
diff --git a/MapControl/Shared/ImageFileCache.cs b/MapControl/Shared/ImageFileCache.cs
index 33af9ee8..b4449ad2 100644
--- a/MapControl/Shared/ImageFileCache.cs
+++ b/MapControl/Shared/ImageFileCache.cs
@@ -27,12 +27,7 @@ namespace MapControl.Caching
 
         public ImageFileCache(string path, TimeSpan expirationScanFrequency)
         {
-            if (string.IsNullOrEmpty(path))
-            {
-                path = "TileCache";
-            }
-
-            rootDirectory = new DirectoryInfo(path);
+            rootDirectory = new DirectoryInfo(!string.IsNullOrEmpty(path) ? path : "TileCache");
             rootDirectory.Create();
 
             Debug.WriteLine($"{nameof(ImageFileCache)}: {rootDirectory.FullName}");
diff --git a/MapControl/Shared/MapGraticule.cs b/MapControl/Shared/MapGraticule.cs
index b7df2d24..89ff2b35 100644
--- a/MapControl/Shared/MapGraticule.cs
+++ b/MapControl/Shared/MapGraticule.cs
@@ -148,14 +148,14 @@ namespace MapControl
 
         private void DrawCylindricalGraticule(PathFigureCollection figures, ICollection<Label> labels)
         {
-            var bounds = ParentMap.ViewRectToBoundingBox(new Rect(0, 0, ParentMap.ActualWidth, ParentMap.ActualHeight));
-            var latLabelStart = Math.Ceiling(bounds.South / lineDistance) * lineDistance;
-            var lonLabelStart = Math.Ceiling(bounds.West / lineDistance) * lineDistance;
+            var boundingBox = ParentMap.ViewRectToBoundingBox(new Rect(0, 0, ParentMap.ActualWidth, ParentMap.ActualHeight));
+            var latLabelStart = Math.Ceiling(boundingBox.South / lineDistance) * lineDistance;
+            var lonLabelStart = Math.Ceiling(boundingBox.West / lineDistance) * lineDistance;
 
-            for (var lat = latLabelStart; lat <= bounds.North; lat += lineDistance)
+            for (var lat = latLabelStart; lat <= boundingBox.North; lat += lineDistance)
             {
-                var p1 = ParentMap.LocationToView(new Location(lat, bounds.West));
-                var p2 = ParentMap.LocationToView(new Location(lat, bounds.East));
+                var p1 = ParentMap.LocationToView(new Location(lat, boundingBox.West));
+                var p2 = ParentMap.LocationToView(new Location(lat, boundingBox.East));
 
                 if (p1.HasValue && p2.HasValue)
                 {
@@ -163,17 +163,17 @@ namespace MapControl
                 }
             }
 
-            for (var lon = lonLabelStart; lon <= bounds.East; lon += lineDistance)
+            for (var lon = lonLabelStart; lon <= boundingBox.East; lon += lineDistance)
             {
-                var p1 = ParentMap.LocationToView(new Location(bounds.South, lon));
-                var p2 = ParentMap.LocationToView(new Location(bounds.North, lon));
+                var p1 = ParentMap.LocationToView(new Location(boundingBox.South, lon));
+                var p2 = ParentMap.LocationToView(new Location(boundingBox.North, lon));
 
                 if (p1.HasValue && p2.HasValue)
                 {
                     figures.Add(CreateLineFigure(p1.Value, p2.Value));
                 }
 
-                for (var lat = latLabelStart; lat <= bounds.North; lat += lineDistance)
+                for (var lat = latLabelStart; lat <= boundingBox.North; lat += lineDistance)
                 {
                     var location = new Location(lat, lon);
                     var position = ParentMap.LocationToView(location);