More config followups