Agregate computation Fixes.