Fix bug, style
Finetuning the auto_build stuff