Adjustments per discussion.

OK pending tests?

Aldy