Fix xml errors