Metadata fixups, tw2.core#90