Merge "Misc fixes for 64-bit Windows toolchain"