fix lost references to service locator