Improvements to static watcher details