Code and doc fixes for WatchOutput