[DF-1214] Minor enhancements.