Improve fixed header performance