Fix Role issues