DF-5312 minor corrections;