Fix spec failures.