Sqlsrv fixes