Fixing UserTO's friend references