* Fix few instances of metadata-fields