More consistency with headers