[COMMIT] Make some small changes to placate the buildbot, src/