fixed some problems with the new ServiceManager