more airbreak tweaks

...but perhaps you have a reason why it shouldn't be an event?