More minor fixes
Merge pull request #501 from Grunthos/master

And some more