Added more XML checks.