Slight tweaks to INTERRUPT setup/teardown