fix azure issues