fixes for interrupts