small cleanup / bugfix in !roles