Storage API fixes