More arm intrinsic fixes