Minor fixes
Merge pull request #848 from gorco/fix

Minor fixes