Fix trivial compilation-errors so the source code builds while
we're at it.