@orta => Inflight fix

There are some miscellaneous fixes in here, too. I've separated them out into individual commits. I'll tag `0.4` once this is merged.