Minor changes for windows