build system improvements