Minor state machine improvements and fixes for IO safety / in-air restart handling