Some windows fixes