More fixing for Azure issue.