Small build system improvements