x86_64 build fixes

Release: 1