Small fixes
Merge pull request #297 from jurriaan/small-fixes

Small fixes & cleanup