Minor xml fixes