Minor additions to the new diverge match algorithm