Fixed adding and removing services