Minor fixes
Merge pull request #617 from GiZig/patch-12

Minor fixes