Refs #9081 More modifications