Fix reference errors; fix unwatch()