Refs #9081 Small clean up
Refs #9081 Various fixes