Minor header improvements