More config adjustments