Minor fixes that conform to buildbot coding/patch specification. Previous commit fixes #2547.