scj: Changes related to interrupts