Fix overriding of config from env vars.