(hopefully) last windows fixes