Fix up interrupt handling