Tweaks to configurable storage feature.