[DF-4571] minor fixes.