Fixes to service locator. Improved examples