Added azure fixes