Fix up some header issues