Fixups for windows