Couple of fixes to make this playbook work more reliably.