Some small fixes

Hey there,

just a couple of small fixes, should be well explained in the commit messages.

Thanks,
D.