fixups x86_64 build