refs #7539 Minor changes