Storage fixes again