Made 4 changes as requested. Refs #962