collection.xconf related fixes