Fix spec issues