Some changes for windows support.