Hot fix some configuration issues
Hotfix another config related bug