More build system improvements.