further arm64 fixes