Missing bits from Arm reorg