Role command tweaks