Fixes to conform to latest azure updates