Settings services to be singletons, fix for #360