Small modifications to well-formedness criteria