Some header changes, presumably from the packaging