Fixes for ZAS issues.
Fixes #2996
Fixes #3023
Merge pull request #3027 from SkyMarshal/airfixes

Fixes for ZAS issues.