Linter fixes, catch interrupts cleanly