Fix a couple of headers