Further changes for ISR/IRQs