Small fixes for azure