headers fixes