More tuning and fixes for the new build system.