Merge airbase changes

Fixes #197