SkyMarshal's ZAS fixes from bef.

Don't want to pull in the pulse feature as well.