diff --git a/src/Linq2GraphQL.Client/GraphClient.cs b/src/Linq2GraphQL.Client/GraphClient.cs
index d3e0e294..68a551df 100644
--- a/src/Linq2GraphQL.Client/GraphClient.cs
+++ b/src/Linq2GraphQL.Client/GraphClient.cs
@@ -1,6 +1,5 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Linq2GraphQL.Client.Converters;
 using Linq2GraphQL.Client.Schema;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
@@ -14,6 +13,11 @@ public class GraphClient
     private readonly IOptions<GraphClientOptions> options;
     private readonly bool includeDeprecated;
 
+    public GraphClient(HttpClient httpClient, IOptions<GraphClientOptions> options, IServiceProvider provider)
+        : this(httpClient, options, provider, false)
+    {
+    }
+
     public GraphClient(HttpClient httpClient, IOptions<GraphClientOptions> options, IServiceProvider provider, bool includeDeprecated = false)
     {
         this.options = options;
@@ -38,7 +42,7 @@ public GraphClient(HttpClient httpClient, IOptions<GraphClientOptions> options,
     public SubscriptionProtocol SubscriptionProtocol => options.Value.SubscriptionProtocol;
     public HttpClient HttpClient { get; }
     public JsonSerializerOptions SerializerOptions { get; }
- 
+
 
     public Func<GraphClient, Task<GraphQLRequest>> WSConnectionInitPayload => options.Value.WSConnectionInitPayload;
     private string GetSubscriptionUrl()
@@ -85,7 +89,7 @@ public async Task<GraphQLSchema> GetSchemaForSafeModeAsync()
                 query = Helpers.SchemaQuery;
             }
 
-                var graphRequest = new GraphQLRequest { Query = query };
+            var graphRequest = new GraphQLRequest { Query = query };
             return await executor.ExecuteRequestAsync("__schema", graphRequest);
         });
     }
diff --git a/src/Linq2GraphQL.Generator/ClientGenerator.cs b/src/Linq2GraphQL.Generator/ClientGenerator.cs
index 9fe195ec..b6adf451 100644
--- a/src/Linq2GraphQL.Generator/ClientGenerator.cs
+++ b/src/Linq2GraphQL.Generator/ClientGenerator.cs
@@ -52,7 +52,7 @@ public async Task<List<FileEntry>> GenerateAsync(Uri uri, string authToken = nul
                 query = General.IntrospectionQuery;
             }
 
-                using var response = await httpClient.PostAsJsonAsync(uri, new { query = query });
+            using var response = await httpClient.PostAsJsonAsync(uri, new { query = query });
             if (!response.IsSuccessStatusCode)
             {
                 throw new Exception(
@@ -106,7 +106,7 @@ public List<FileEntry> Generate(string schemaJson)
 
             var classInterfacesList = schema.GetClassTypes()?.Where(e => e.HasInterfaces)
                 ?.SelectMany(i => i.Interfaces?.ToDictionary(e => i.Name, e => e.Name))?.ToList() ?? new List<KeyValuePair<string, string>>();
-            
+
             var interfaces = schema.GetInterfaces();
             if (interfaces != null)
             {
diff --git a/src/Linq2GraphQL.Generator/Linq2GraphQL.Generator.csproj b/src/Linq2GraphQL.Generator/Linq2GraphQL.Generator.csproj
index 10fbf8b9..8474319f 100644
--- a/src/Linq2GraphQL.Generator/Linq2GraphQL.Generator.csproj
+++ b/src/Linq2GraphQL.Generator/Linq2GraphQL.Generator.csproj
@@ -6,6 +6,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <PackAsTool>true</PackAsTool>
         <ToolCommandName>Linq2GraphQL</ToolCommandName>
+        <TransformOnBuild>true</TransformOnBuild>
 
 		<Authors>Joakim Dangården, Magnus Ahlberg</Authors>
 		<Company>Linq2GraphQL</Company>
diff --git a/src/Linq2GraphQL.Generator/Templates/Scalars/ScalarTemplate.cs b/src/Linq2GraphQL.Generator/Templates/Scalars/ScalarTemplate.cs
index 2c78fa4f..d47349c1 100644
--- a/src/Linq2GraphQL.Generator/Templates/Scalars/ScalarTemplate.cs
+++ b/src/Linq2GraphQL.Generator/Templates/Scalars/ScalarTemplate.cs
@@ -37,10 +37,10 @@ public virtual string TransformText()
             #line default
             #line hidden
             this.Write(";\r\n\r\n    /// <summary>\r\n    /// ");
-            
+
             #line 13 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Scalars\ScalarTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(scalarType.SummaryDescription));
-            
+            this.Write(this.ToStringHelper.ToStringWithCulture(scalarType.SummaryDescription ?? $"Represents the {scalarType.Name} scalar type"));
+
             #line default
             #line hidden
             this.Write("\r\n    /// </summary>\r\n    [JsonConverter(typeof(CustomScalarConverter<");
diff --git a/src/Linq2GraphQL.Generator/Templates/Scalars/ScalarTemplate.tt b/src/Linq2GraphQL.Generator/Templates/Scalars/ScalarTemplate.tt
index b9753998..d3d34702 100644
--- a/src/Linq2GraphQL.Generator/Templates/Scalars/ScalarTemplate.tt
+++ b/src/Linq2GraphQL.Generator/Templates/Scalars/ScalarTemplate.tt
@@ -10,7 +10,7 @@ using System.Text.Json.Serialization;
 namespace <#= namespaceName #>;
 
     /// <summary>
-    /// <#= scalarType.SummaryDescription #>
+    /// <#= scalarType.SummaryDescription ?? $"Represents the {scalarType.ScalarTypeName} scalar type" #>
     /// </summary>
     [JsonConverter(typeof(CustomScalarConverter<<#= className #>>))]
     public partial class <#= className #> : CustomScalar {}
\ No newline at end of file