Some windows fixes.