Some more plugin.xml fixes