Fix to issues with roles