some header_extension fixes