Config fixes
Merge