Fix headers and typo