Various changes for windows.