Try to fix up interrupt handling some more