Adjust some header stuff