Just small finetunings on headers