Minor build system tweaks