Starting fixes to stoplight_watcher.