File headers fixes