Refs #6616. Minor improvements