Fix regressions after adding ARM support