Fix add, part and disconnect behaviour