Dynamically check headers
Header fixes