Metadata-related fixes and additions.