Fix spec failures