Fixed watcher code for configuration changes