Revision of spec issues