fix some header stuffs