Make config files pick values ported from PR #32