Fixing metadata