Fix a couple issues with Win64 ABI