Changes to make dist build have the right config