Fixes to Metadata.xml