fix some header issues