Fixes for the playbook