Tweaks and fixes for 'roles and permissions'.