Azure review fixes.