Adjust #2354 by Henry: Some adjusts on the config.xml file