Storage size fixes v2

Fixes issue #1524