Fix bugs in config.xml handling caused by xml-mapping component

This fixes issue #223, #231, and #235