diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj
index 49312f85d9..3a79bb0ef4 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj
@@ -35,8 +35,6 @@
         <PackageReference Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Microsoft.EntityFrameworkCore.Sqlite" />
         <PackageReference Include="Bit.BlazorUI.Extras" />
         <!--/-:msbuild-conditional:noEmit -->
-        <PackageReference Include="Bit.CodeAnalyzers" PrivateAssets="all" />
-        <PackageReference Include="Bit.SourceGenerators" PrivateAssets="all" />
         <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" />
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" />
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiDeviceCoordinator.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiDeviceCoordinator.cs
index 49fb69ccb3..ee9090af41 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiDeviceCoordinator.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiDeviceCoordinator.cs
@@ -25,7 +25,7 @@ public async Task ApplyTheme(bool isDark)
         await Device.InvokeOnMainThreadAsync(() =>
         {
             UIKit.UIApplication.SharedApplication.SetStatusBarStyle(statusBarStyle, false);
-            Platform.GetCurrentUIViewController().SetNeedsStatusBarAppearanceUpdate();
+            Platform.GetCurrentUIViewController()!.SetNeedsStatusBarAppearanceUpdate();
         });
 #elif MACCATALYST
         var window = UIKit.UIApplication.SharedApplication.Windows[0].WindowScene;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Boilerplate.Tests.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Boilerplate.Tests.csproj
index 604133af8b..7e6347a90f 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Boilerplate.Tests.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Boilerplate.Tests.csproj
@@ -16,8 +16,6 @@
         <PackageReference Include="Microsoft.Playwright.MSTest" />
         <PackageReference Include="MSTest.TestAdapter" />
         <PackageReference Include="MSTest.TestFramework" />
-        <PackageReference Include="Bit.CodeAnalyzers" PrivateAssets="all" />
-        <PackageReference Include="Bit.SourceGenerators" PrivateAssets="all" />
     </ItemGroup>
 
     <ItemGroup>