DDI 3.2 public review fixes

Initial fixes that were the result of the 3.2 public review