MetadataField bugfixes after testing