Fix non thread safe code around serviceLocator function and the like also remove useless shortcut svcLoc