Some minor fixes
Merge pull request #753 from WouterJ/patch-1

Some minor fixes