refs #6667 minor changes

mainly related to ongoing work on other branches