Fix issue with watchers
Don't rebuild scope moments if not necessary