Small fixes
Merge pull request #1110 from EPuncker/master

Small fixes