Fix config madness.
Merge branch 'hotfix/Config_problems'