diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml
index 4958aa6..2271787 100644
--- a/.github/workflows/dotnet-format.yml
+++ b/.github/workflows/dotnet-format.yml
@@ -17,5 +17,5 @@ jobs:
           
       - name: Format
         working-directory: ./src
-        run: dotnet format --verify-no-changes 
+        run: dotnet format --verify-no-changes --no-restore
         
\ No newline at end of file
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 35a6c10..00d5659 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
     - uses: actions/checkout@v4
@@ -20,6 +20,16 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.0.x
+    - name: Setup JDK
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'microsoft'
+        java-version: '17'
+    - name: Setup Android SDK
+      uses: android-actions/setup-android@v3
+    - name: Restore workloads
+      working-directory: ./src
+      run: dotnet workload restore
     - name: Restore dependencies
       working-directory: ./src
       run: dotnet restore
diff --git a/src/Raygun.Blazor.Maui/Control/RaygunErrorBoundary.cs b/src/Raygun.Blazor.Maui/Control/RaygunErrorBoundary.cs
index a3d27e1..434bb10 100644
--- a/src/Raygun.Blazor.Maui/Control/RaygunErrorBoundary.cs
+++ b/src/Raygun.Blazor.Maui/Control/RaygunErrorBoundary.cs
@@ -18,13 +18,13 @@ public class RaygunErrorBoundary : ErrorBoundary
         /// 
         /// </summary>
         [Inject]
-        internal RaygunBlazorClient RaygunClient { get; set; }
+        required public RaygunBlazorClient RaygunClient { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
         [Inject]
-        internal IOptions<RaygunSettings> RaygunSettings { get; set; }
+        required public IOptions<RaygunSettings> RaygunSettings { get; set; }
 
         #endregion
 
diff --git a/src/Raygun.Blazor.Maui/Raygun.Blazor.Maui.csproj b/src/Raygun.Blazor.Maui/Raygun.Blazor.Maui.csproj
index 864df6a..8ccc39c 100644
--- a/src/Raygun.Blazor.Maui/Raygun.Blazor.Maui.csproj
+++ b/src/Raygun.Blazor.Maui/Raygun.Blazor.Maui.csproj
@@ -1,9 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
+        <TargetFrameworks>net8.0-android</TargetFrameworks>
         <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">
-            $(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+            $(TargetFrameworks);net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.19041.0</TargetFrameworks>
+        <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('osx'))">
+            $(TargetFrameworks);net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
         <!-- Uncomment to also build the tizen app. You will need to install tizen by following
         this: https://github.com/Samsung/Tizen.NET -->
         <!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
diff --git a/src/Raygun.Blazor/Offline/SendStrategy/TimerBasedSendStrategy.cs b/src/Raygun.Blazor/Offline/SendStrategy/TimerBasedSendStrategy.cs
index 69d86cc..f4a0ec8 100644
--- a/src/Raygun.Blazor/Offline/SendStrategy/TimerBasedSendStrategy.cs
+++ b/src/Raygun.Blazor/Offline/SendStrategy/TimerBasedSendStrategy.cs
@@ -35,6 +35,9 @@ public TimerBasedSendStrategy(TimeSpan? interval = null)
         Start();
     }
 
+    /// <summary>
+    /// Class destructor. Disposes the timer.
+    /// </summary>
     ~TimerBasedSendStrategy()
     {
         Dispose();
diff --git a/src/Raygun.Samples.Blazor.Maui/MauiProgram.cs b/src/Raygun.Samples.Blazor.Maui/MauiProgram.cs
index 7bb9fac..03d9f83 100644
--- a/src/Raygun.Samples.Blazor.Maui/MauiProgram.cs
+++ b/src/Raygun.Samples.Blazor.Maui/MauiProgram.cs
@@ -29,8 +29,8 @@ public static MauiApp CreateMauiApp()
             builder.Services.AddMauiBlazorWebView();
 
 #if DEBUG
-    		builder.Services.AddBlazorWebViewDeveloperTools();
-    		builder.Logging.AddDebug();
+            builder.Services.AddBlazorWebViewDeveloperTools();
+            builder.Logging.AddDebug();
 #endif
 
             return builder.Build();
diff --git a/src/Raygun.Samples.Blazor.Maui/Raygun.Samples.Blazor.Maui.csproj b/src/Raygun.Samples.Blazor.Maui/Raygun.Samples.Blazor.Maui.csproj
index df5e0fd..7efaf6b 100644
--- a/src/Raygun.Samples.Blazor.Maui/Raygun.Samples.Blazor.Maui.csproj
+++ b/src/Raygun.Samples.Blazor.Maui/Raygun.Samples.Blazor.Maui.csproj
@@ -1,8 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-        <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+        <TargetFrameworks>net8.0-android</TargetFrameworks>
+        <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">
+            $(TargetFrameworks);net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.19041.0</TargetFrameworks>
+        <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('osx'))">
+            $(TargetFrameworks);net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
         <!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
         <!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->