Updates to interrupt handling