refs #10208. Fix issues raised in testing.