Tried to fix 2 failures. Refs #9708.