Fixed some header issues