Azure storage fixes
Azure storage fixes