Fix spec problems