Small bugfixes in several roles