Clean up 64-bit build for recent changes