Issue 205: misc XML config bug fixes

Three bug fixes for the price of one.