Fix mapping of -Z