Upgrade to Airlift 0.98-SNAPSHOT