Small fixes to be inline with the changes in Git master

The new Git release is around the corner. We noticed some small bugs which needed to be fixed with the changes coming in Git.

The MR encompasses those changes. Commit 1 is mostly a preparatory commit. Commits 2, 3 hold the actual fixes!