Minor tweaks.  Identifier a new issue #305