Fixes to support full rollup of values