A few small header changes