Some more header tweaking