Fix watchers and user feedback