more cloud storage fixes