random buildserver fixes

Here is a collection of small buildserver fixes that I've done in the process of other work. Details are in the commit messages. I think they should be relatively safe.