Refs #6. Logging tweak