Fixed data watchers bugs in development