Fix relationship between watchers and watching