More ARM fixes