Small fixes to allow for task interrupts