Small fixes from Dries.

Fixes from small-fixes.patch.

Closes #3530282

Merge request reports

Loading