[DF-4571] Fix review issues.