Many bugfixes in various roles