Prepare for smtp-13 and ops-07