playbook and BBOS fixes for issue #592