interrupt related bugfixes