Minor fixes
Merge pull request #885 from tambry/Fixes

Minor fixes