Nitpicks

It would be nice to merge these nitpicks before the release :)