fixes to get 1.0 merge running in azure again