Config final tweaks