Various XML fixes to update methods