Several improves in locator and introspection
disable watcher
Merge pull request #1239 from diegosarmentero/nowatcher

No watcher