Fixed up roles tasks