refs #8804 Fixing errors after merge