Further fixes in feature.xml