Minor header format updates