Further compabtible changes for MS SQL deployment