Storage fixes