Fixed some bugs.  Refs #8096.