code review fixes
refs #584