Next sequence of fixes. We are getting close to the end (after this patch set, only 39 commits are left behind).