Some minor small fixes.
Merge pull request #183 from simongog/minor_fixes

Some minor small fixes.