Update headers and a couple of other things