small changes for interrupt handling