A few playbook fixes