Further tweaks to the metadata to make it valid.