Minor Changes in WatchManager