Fixes for XML config tasks