Misc storage tweaks and fixes