More flow changes, refs #3