Fixing config issues