Fix issue related to watcher, minor clean up