more fixes
refs #62