Refs #8632. Fixing some last errors.