Minor fixes based on pull request comments
Merge pull request #36 from Mike-GC/bug4435

Minor fixes based on pull request comments