refs #2652 - Fix demo 1 reported issues