Initial blind fixup for arm for irq changes