Minor changes for azure.