More windows fixes