Last bunch of metadata.xml files
Various metadata.xml fixes