More attempts to get Headers working correctly in the library