SQL Server| Some more fixes