More fixes for merging config