Fix roles to make it work