More fixes for snapshot size calculation.