Even more header fixing