build: x86_64 bootstrap build fixes and workaround.