Refs #9081 Fixing some bugs