Z: minor fixes