Fixed up AS group/role options