Fix minor XML inconsistencies