Merge "Fix windows 64-bit builds" into nyc-dev