Azure: correct mistakes in recent fixes