Fixing up the confguration for core services