More windows fixes.