Actually fix headers