Minor fixes
Merge pull request #153 from nhr/minor_fixes

Minor fixes