Minor header modifications