Add a couple of small updates

Created by: derkling

Sharing them here mainly to get a feedback on their utility... I'm finding them useful, not sure whether it make sense to have them mainline, especially in the current form.

Adding @valschneider also because the first patch overlaps with his #356 series.