Interrupt fixes