Improve headers coercing