Fixes from integration testing with Scaler.
Merge pull request #13 from rjnagal/aggregate

Fixes from integration testing with Scaler.