Updates needed for azure build with installers