Minor fixes to equality and role selection