Make sure we always end up with the proper list of services