Minor additional tweaks.
Merge pull request #1 from pchote/my-tweaks

Minor additional tweaks.