Minor xml fixes caught by lint