More config refinements.