Changes to make dist build have the right config

@hippee-lee, @tsanko small change to get the correct config in the dist build