changes due to arm64 support