More changes for SQL Server Conversion