Small bugfixes in three roles