Minor header changes