Build system improvements