Fix watchers for members