Minor fixes
Merge pull request #248 from jgho/bugFixes

Minor fixes