Minor build system changes