Small fixes, refs #4767