Make the interrupt handling better.