Fix some trivial things in the build system