Trying to fix header issues