IRQs and some other changes