Fix small bugs. Refs #6965