Fix arm* build failures