Inconsequential fixes

None of these changes actually affect the behaviour of the installed code.