Housekeeping

As the year-end is approaching, let's join efforts and do some housekeeping :)

This PR is a collection of various fixes / cleanups (see individual commits) that did not yet found their way back upstream