More finetuning of auto_build