tweaks to service-manager war