Little bug fixes with add and remove