more azure-specific changes