Fixup make_friend and remove_friend properly