Fine-tuning the build