Xquartz playbook fixes