Move disabling interrupts a bit upper