More work on fixing interrupts