Fixes for new RoleAssignment.parent_id assignment