Fixing up metadata