Fix friendships bugs