Fixup config issues