Config override improvements.