AddFriend minor fixes