Minor fixes to Metadata.