[TIMOB-13030] Fixed some bugs where deferred calculations weren't contri...

...buting properly to running sums