diff --git a/Lite.Tests/DuckDbSchemaTests.cs b/Lite.Tests/DuckDbSchemaTests.cs
index a0460b3..e30dbc9 100644
--- a/Lite.Tests/DuckDbSchemaTests.cs
+++ b/Lite.Tests/DuckDbSchemaTests.cs
@@ -136,8 +136,8 @@ public void SchemaStatements_MatchTableCount()
         foreach (var _ in Schema.GetAllTableStatements())
             tableCount++;
 
-        /* 24 tables from Schema (schema_version is created separately by DuckDbInitializer) */
-        Assert.Equal(24, tableCount);
+        /* 26 tables from Schema (schema_version is created separately by DuckDbInitializer) */
+        Assert.Equal(26, tableCount);
     }
 
     [Fact]
diff --git a/install/53_collect_server_properties.sql b/install/53_collect_server_properties.sql
index 9cf046e..6bdce6f 100644
--- a/install/53_collect_server_properties.sql
+++ b/install/53_collect_server_properties.sql
@@ -212,9 +212,9 @@ BEGIN
                     N'SHA2_256',
                     CONCAT
                     (
-                        SERVERPROPERTY(N'Edition'), N'|',
-                        SERVERPROPERTY(N'ProductVersion'), N'|',
-                        SERVERPROPERTY(N'ProductLevel'), N'|',
+                        CONVERT(nvarchar(128), SERVERPROPERTY(N'Edition')), N'|',
+                        CONVERT(nvarchar(128), SERVERPROPERTY(N'ProductVersion')), N'|',
+                        CONVERT(nvarchar(128), SERVERPROPERTY(N'ProductLevel')), N'|',
                         @engine_edition, N'|',
                         (SELECT osi.cpu_count FROM sys.dm_os_sys_info AS osi), N'|',
                         (SELECT osi.physical_memory_kb FROM sys.dm_os_sys_info AS osi), N'|',