Merge "Fix windows 64-bit builds"