DDF-335: review comment fixes