Minor improvements to the header