Fixing up the yaml header etc