Fix default options being lost in Services - now we can override only those settings we wish to