Minor changes. refs #437
Merged. refs #437