Fix build for arm64, x86_64 builds