Friendship fixes