Roles: little tweaks and fixes