fix some azure issues