Bug fixes to the watch and unwatch commands.