Fix issues; role service