More header comment fixes