Minor build system fixes.