diff --git a/src/BootstrapBlazor.Server/Controllers/WaterfallController.cs b/src/BootstrapBlazor.Server/Controllers/WaterfallController.cs
index 9ad81bacdaf..2b1c3255b53 100644
--- a/src/BootstrapBlazor.Server/Controllers/WaterfallController.cs
+++ b/src/BootstrapBlazor.Server/Controllers/WaterfallController.cs
@@ -22,7 +22,12 @@ public async Task<IActionResult> Index([FromServices] IWebHostEnvironment env, [
     {
         var interval = Random.Shared.Next(1, 2000);
         await Task.Delay(interval);
-        var fileName = Path.Combine(env.WebRootPath, "images/waterfall", $"{id}.jpeg");
+#if DEBUG
+        var fileName = Path.Combine(env.WebRootPath, "../../");
+#else
+        var fileName = Path.Combine(AppContext.BaseDirectory, "_content");
+#endif
+        fileName = Path.Combine(fileName, "BootstrapBlazor.Shared/wwwroot/images/waterfall", $"{id}.jpeg");
         return new PhysicalFileResult(fileName, "images/jpeg");
     }
 }
diff --git a/src/BootstrapBlazor.Shared/Components/Samples/Collapses.razor.cs b/src/BootstrapBlazor.Shared/Components/Samples/Collapses.razor.cs
index 2b072dc9f23..2dc821caf5d 100644
--- a/src/BootstrapBlazor.Shared/Components/Samples/Collapses.razor.cs
+++ b/src/BootstrapBlazor.Shared/Components/Samples/Collapses.razor.cs
@@ -26,7 +26,7 @@ private void OnToggle()
         State = !State;
     }
 
-    private string Value { get; set; }
+    private string? Value { get; set; }
 
     private IEnumerable<SelectedItem> Items { get; set; } = new[]
     {
diff --git a/src/BootstrapBlazor.Shared/Components/Samples/IntersectionObservers.razor.cs b/src/BootstrapBlazor.Shared/Components/Samples/IntersectionObservers.razor.cs
index cbcfad3b428..9b37c5a0dc5 100644
--- a/src/BootstrapBlazor.Shared/Components/Samples/IntersectionObservers.razor.cs
+++ b/src/BootstrapBlazor.Shared/Components/Samples/IntersectionObservers.razor.cs
@@ -23,7 +23,7 @@ protected override void OnInitialized()
     {
         base.OnInitialized();
 
-        _images = Enumerable.Range(1, 100).Select(i => "../../images/default.jpeg").ToList();
+        _images = Enumerable.Range(1, 100).Select(i => "./_content/BootstrapBlazor.Shared/images/default.jpeg").ToList();
         _items = Enumerable.Range(1, 20).Select(i => $"https://picsum.photos/160/160?random={i}").ToList();
     }
 
diff --git a/src/BootstrapBlazor.Shared/Components/Samples/MouseFollowers.razor b/src/BootstrapBlazor.Shared/Components/Samples/MouseFollowers.razor
index 9e816b8dc37..897a4f05f23 100644
--- a/src/BootstrapBlazor.Shared/Components/Samples/MouseFollowers.razor
+++ b/src/BootstrapBlazor.Shared/Components/Samples/MouseFollowers.razor
@@ -44,7 +44,7 @@
                Introduction="@Localizer["MouseFollowerIconIntro"]"
                Name="MouseFollowerIcon">
         <MouseFollower FollowerMode="MouseFollowerMode.Image"
-                       Content="././images/performance.svg">
+                       Content="./_content/BootstrapBlazor.Shared/images/performance.svg">
             <div class="mouseFollower-demo" />
         </MouseFollower>
     </DemoBlock>
@@ -54,7 +54,7 @@
                Name="MouseFollowerImage">
         <MouseFollower Options="@FollowerImageOptions"
                        FollowerMode="MouseFollowerMode.Image"
-                       Content="././images/mousefollower/cat.gif">
+                       Content="./_content/BootstrapBlazor.Shared/images/mousefollower/cat.gif">
             <div class="mouseFollower-demo" />
         </MouseFollower>
     </DemoBlock>
diff --git a/src/BootstrapBlazor.Shared/Components/Samples/Tutorials/DrawingApp.razor b/src/BootstrapBlazor.Shared/Components/Samples/Tutorials/DrawingApp.razor
index ce572ea8a66..94874259839 100644
--- a/src/BootstrapBlazor.Shared/Components/Samples/Tutorials/DrawingApp.razor
+++ b/src/BootstrapBlazor.Shared/Components/Samples/Tutorials/DrawingApp.razor
@@ -2,7 +2,7 @@
 @inject MessageService MessageService
 @inject DownloadService DownloadService
 @inherits BootstrapModuleComponentBase
-@attribute [JSModuleAutoLoader("../../_content/BootstrapBlazor.Shared/Components/Components/Samples/Tutorials/DrawingApp.razor.js")]
+@attribute [JSModuleAutoLoader("../../_content/BootstrapBlazor.Shared/Components/Samples/Tutorials/DrawingApp.razor.js")]
 
 <div>
     <canvas id="@Id" class="drawing-canvas"></canvas>
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index acb069f3c5a..eabc92208a5 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.0.2</Version>
+    <Version>9.1.0</Version>
   </PropertyGroup>
 
   <ItemGroup>