Minor fixes
Merge pull request #240 from lydell/minor-fixes

Minor fixes