fixes on config side