Add another stage to support xz, and a missing cmp