Improve headers.