Minor build system fixes