Bugfixes in multiple roles