Fixed another couple of bugs in add/remove.