XML fix and additions