Fix add and remove host