fixes for azure