Some fixes -refs #7107