Fixes due to the MetadataInterface changes