BZ-9217: Improve Header Inconsitancies