Small windows fixes