Metadata set fixes
2 files changed