Changes to support arm64 and x86_64