Squashed storage bugs