More fixes to service infrastructure.