more Storage fixes