some fixes -refs #6680