Additional changes to ARM package