DDF-186 code review fixes