Small fixes to windows build