Small bugfixes and suability improvmenets. Refs #10046.