Fix inconsistency between {add,remove}_connection