minor build system fixes