ServiceLocator tweaks
Minor fix in translator