windows: more changes