Fix to issues with roles
Merge branch 'abstractj-roles'