Fix Metadata issues