Fixed spec issues