diff --git a/.github/workflows/GithubActionsRelease.yml b/.github/workflows/GithubActionsRelease.yml
index 437578f..5aaeed7 100644
--- a/.github/workflows/GithubActionsRelease.yml
+++ b/.github/workflows/GithubActionsRelease.yml
@@ -62,8 +62,7 @@ jobs:
     - name: Use dotnet
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.x'
-        include-prerelease: true
+        dotnet-version: '8.x'
 
     - name: Build HttpSecurity.AspNet 🔧
       run: dotnet build ${{env.projectCSFB}} --configuration ${{env.buildConfiguration}} -p:Version=${{env.version}}
diff --git a/.github/workflows/GithubActionsWIP.yml b/.github/workflows/GithubActionsWIP.yml
index 24042d5..b87097a 100644
--- a/.github/workflows/GithubActionsWIP.yml
+++ b/.github/workflows/GithubActionsWIP.yml
@@ -57,8 +57,7 @@ jobs:
     - name: Use dotnet
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.x'
-        include-prerelease: true
+        dotnet-version: '8.x'
 
     - name: Build HttpSecurity.AspNet 🔧
       run: dotnet build ${{env.projectCSFB}} --configuration ${{env.buildConfiguration}} --version-suffix ${{env.ciSuffix}}
diff --git a/HttpSecurity.AspNet/Services/HttpSecurityOptions.cs b/HttpSecurity.AspNet/Services/HttpSecurityOptions.cs
index 6fdb791..09b88de 100644
--- a/HttpSecurity.AspNet/Services/HttpSecurityOptions.cs
+++ b/HttpSecurity.AspNet/Services/HttpSecurityOptions.cs
@@ -14,7 +14,7 @@ public sealed class HttpSecurityOptions
     /// <summary>
     /// The built content security policy.
     /// </summary>
-    internal ContentSecurityPolicyOptions ContentSecurityPolicy { get; set; } = null;
+    internal ContentSecurityPolicyOptions? ContentSecurityPolicy { get; set; } = null;
 
 
     /// <summary>
diff --git a/HttpSecurity.Example/Program.cs b/HttpSecurity.Example/Program.cs
index 78c153b..993d894 100644
--- a/HttpSecurity.Example/Program.cs
+++ b/HttpSecurity.Example/Program.cs
@@ -102,11 +102,11 @@
 }
 
 // Added for debugging purposes - do not include this in your project
-//app.Use(async (context, next) =>
-//{
-//    // Call the next delegate/middleware in the pipeline.
-//    await next(context);
-//});
+app.Use(async (context, next) =>
+{
+    // Call the next delegate/middleware in the pipeline.
+    await next(context);
+});
 
 app.UseHttpsRedirection();
 
diff --git a/SourceGenerator/SourceGenerator.csproj b/SourceGenerator/SourceGenerator.csproj
index 67d9471..def7e04 100644
--- a/SourceGenerator/SourceGenerator.csproj
+++ b/SourceGenerator/SourceGenerator.csproj
@@ -4,6 +4,8 @@
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<LangVersion>11</LangVersion>
 
+		<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+		
 		<!-- Uncomment the line below to debug the source generator -->
 		
 		<!--<DefineConstants>GENERATOR_DEBUG</DefineConstants>-->