A few little fixes

I'll redo the commits within the same pull request. But it won't be before this evening.

If you have possible conflicting changes to propose, don't wait for me, I'll rebase if needed. :)