diff --git a/SQLWATCHDB/Properties/AssemblyInfo.cs b/SQLWATCHDB/Properties/AssemblyInfo.cs
index 3bb247fe..a28f120a 100644
--- a/SQLWATCHDB/Properties/AssemblyInfo.cs
+++ b/SQLWATCHDB/Properties/AssemblyInfo.cs
@@ -19,5 +19,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.4.*")]
-[assembly: AssemblyFileVersion("2.4.0.0")]
+[assembly: AssemblyVersion("2.5.*")]
+[assembly: AssemblyFileVersion("2.5.0.0")]
diff --git a/SQLWATCHDB/Scripts/Pre-Deployment/SetDacVersion.sql b/SQLWATCHDB/Scripts/Pre-Deployment/SetDacVersion.sql
index 8c375203..42421eeb 100644
Binary files a/SQLWATCHDB/Scripts/Pre-Deployment/SetDacVersion.sql and b/SQLWATCHDB/Scripts/Pre-Deployment/SetDacVersion.sql differ
diff --git a/SQLWATCHDB/dbo/Procedures/usp_sqlwatch_logger_disk_utilisation_table.sql b/SQLWATCHDB/dbo/Procedures/usp_sqlwatch_logger_disk_utilisation_table.sql
index 17706141..4ab0b5dd 100644
--- a/SQLWATCHDB/dbo/Procedures/usp_sqlwatch_logger_disk_utilisation_table.sql
+++ b/SQLWATCHDB/dbo/Procedures/usp_sqlwatch_logger_disk_utilisation_table.sql
@@ -57,11 +57,11 @@ select
 	/* only take table compression into account and not index compression.
 	   we have index analysis elsewhere */
 	[data_compression] = max(case when i.index_id = 0 then p.[data_compression] else 0 end)
-from sys.tables t
-inner join sys.indexes i on t.object_id = i.object_id
-inner join sys.partitions p on i.object_id = p.object_id AND i.index_id = p.index_id
-inner join sys.allocation_units a on p.partition_id = a.container_id
-inner join sys.schemas s on t.schema_id = s.schema_id
+from [?].sys.tables t
+inner join [?].sys.indexes i on t.object_id = i.object_id
+inner join [?].sys.partitions p on i.object_id = p.object_id AND i.index_id = p.index_id
+inner join [?].sys.allocation_units a on p.partition_id = a.container_id
+inner join [?].sys.schemas s on t.schema_id = s.schema_id
 inner join sys.databases sdb on sdb.name = ''?''
 
 group by s.name, t.name, sdb.name, sdb.create_date;