Hack for some header changes