DF-663 and DF-765 additional fixes.