Small changes for elliptics-stop playbook