changes for windows support