Merge ARM fixes