Patch for header changes