Windows build amends