Airlock fixes
Merge pull request #203 from ZomgPonies/master

Airlock fixes