Bug fix for UI and Azure