A fix and a couple of improvements

[nolexa]

Basically, I described the motivations in the commits. I'm not sure if it's a good idea to send all three commits in one pull request, I just don't know how to do this right way. Hopefully, they can be cherry picked if you will not find all of them useful.