diff --git a/src/AsyncAPI.Saunter.Generator.Cli/FromSpec/FromSpecCommand.cs b/src/AsyncAPI.Saunter.Generator.Cli/FromSpec/FromSpecCommand.cs
index 8b76144..441a02f 100644
--- a/src/AsyncAPI.Saunter.Generator.Cli/FromSpec/FromSpecCommand.cs
+++ b/src/AsyncAPI.Saunter.Generator.Cli/FromSpec/FromSpecCommand.cs
@@ -18,7 +18,7 @@ public async Task<int> FromSpec(params string[] specs)
 
         var specsToGenerate = Split(specs);
         var output = await codeGenerator.FromSpecs(specsToGenerate).ConfigureAwait(false);
-        
+
         // Write to file
         foreach (var (spec, contents) in output)
         {
diff --git a/src/AsyncAPI.Saunter.Generator.Cli/Program.cs b/src/AsyncAPI.Saunter.Generator.Cli/Program.cs
index f93f804..523b843 100644
--- a/src/AsyncAPI.Saunter.Generator.Cli/Program.cs
+++ b/src/AsyncAPI.Saunter.Generator.Cli/Program.cs
@@ -14,7 +14,7 @@
 var logger = serviceProvider.GetRequiredService<ILogger<Program>>();
 ConsoleApp.LogError = msg => logger.LogError(msg);
 ConsoleApp.ServiceProvider = serviceProvider;
-logger.LogDebug($"Generator.Cli args: {string.Join(' ', args)}");
+//logger.LogDebug($"Generator.Cli args: {string.Join(' ', args)}");
 
 var app = ConsoleApp.Create();
 app.Add<ToFileCommand>();
diff --git a/src/AsyncAPI.Saunter.Generator.SourceGenerator/AsyncAPI.Saunter.Generator.SourceGenerator.csproj b/src/AsyncAPI.Saunter.Generator.SourceGenerator/AsyncAPI.Saunter.Generator.SourceGenerator.csproj
index 2e7f676..ab71919 100644
--- a/src/AsyncAPI.Saunter.Generator.SourceGenerator/AsyncAPI.Saunter.Generator.SourceGenerator.csproj
+++ b/src/AsyncAPI.Saunter.Generator.SourceGenerator/AsyncAPI.Saunter.Generator.SourceGenerator.csproj
@@ -55,7 +55,7 @@
     <None Include="build/*" Pack="true" PackagePath="/build" />
 
     <!-- Package the generator in the analyzer directory of the nuget package -->
-    <None Include="$(OutputPath)" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+    <None Include="$(OutputPath)*" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/AsyncAPI.Saunter.Generator.SourceGenerator/SpecFirstCodeGenerator.cs b/src/AsyncAPI.Saunter.Generator.SourceGenerator/SpecFirstCodeGenerator.cs
index f3ecb45..6a07bac 100644
--- a/src/AsyncAPI.Saunter.Generator.SourceGenerator/SpecFirstCodeGenerator.cs
+++ b/src/AsyncAPI.Saunter.Generator.SourceGenerator/SpecFirstCodeGenerator.cs
@@ -42,7 +42,7 @@ private static async void GenerateCode(SourceProductionContext context, (Analyze
             context.AddSource($"{spec.SpecFileName}.g.cs", contents);
         }
     }
-    
+
     public static readonly DiagnosticDescriptor MissingNamespace = new(
         "AA0001",
         "No namespace provided for AsyncAPI code generator",
diff --git a/src/AsyncAPI.Saunter.Generator/FromSpec/AsyncApiInterface/AsyncApiGenerator.cs b/src/AsyncAPI.Saunter.Generator/FromSpec/AsyncApiInterface/AsyncApiGenerator.cs
index 19a25b6..11c3808 100644
--- a/src/AsyncAPI.Saunter.Generator/FromSpec/AsyncApiInterface/AsyncApiGenerator.cs
+++ b/src/AsyncAPI.Saunter.Generator/FromSpec/AsyncApiInterface/AsyncApiGenerator.cs
@@ -46,7 +46,7 @@ public string GenerateAsyncApiInterfaces(GeneratorOptions options, AsyncApiDocum
 
         // Events
         this.AddInterface(sb, options, options.ClassName, $"{options.ClassName}Events", new("PublishOperation", "evt", x => x.Publish), asyncApiDocument.Channels.Where(x => x.Value.Publish != null));
-        
+
         sb.AppendLine("}"); // close namespace
         sb.AppendLine();
 
diff --git a/src/AsyncAPI.Saunter.Generator/FromSpec/DataTypes/DataTypesGenerator.cs b/src/AsyncAPI.Saunter.Generator/FromSpec/DataTypes/DataTypesGenerator.cs
index 4c95a5c..8892869 100644
--- a/src/AsyncAPI.Saunter.Generator/FromSpec/DataTypes/DataTypesGenerator.cs
+++ b/src/AsyncAPI.Saunter.Generator/FromSpec/DataTypes/DataTypesGenerator.cs
@@ -1,8 +1,7 @@
 using NJsonSchema;
-using NSwag.CodeGeneration.CSharp;
-using NSwag;
 using NJsonSchema.CodeGeneration.CSharp;
-
+using NSwag;
+using NSwag.CodeGeneration.CSharp;
 
 namespace AsyncAPI.Saunter.Generator.FromSpec.DataTypes;
 
diff --git a/src/AsyncAPI.Saunter.Generator/FromSpec/DataTypes/OpenApiCompatibility.cs b/src/AsyncAPI.Saunter.Generator/FromSpec/DataTypes/OpenApiCompatibility.cs
index 55a5941..b103a1f 100644
--- a/src/AsyncAPI.Saunter.Generator/FromSpec/DataTypes/OpenApiCompatibility.cs
+++ b/src/AsyncAPI.Saunter.Generator/FromSpec/DataTypes/OpenApiCompatibility.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Nodes;
-using YamlDotNet.RepresentationModel;
 using Yaml2JsonNode;
+using YamlDotNet.RepresentationModel;
 
 namespace AsyncAPI.Saunter.Generator.FromSpec.DataTypes;