Metadata fixing