Fixing xml validation errors.