Storage bugfixes