Fixes some of the header issues