Further header tweaking