Still fixing MS SQL issues