Update headers and such