More config header fine tuning