Fix up metadata