ARM64 fixes from Dave Nuechterlein