Fix bugs with adding and removing services and options.