Fix up headers, etc