Fixes to abbey external playbook support