Minor updates for windows