(Playbook) Build fixes