Changes for arm-based devices