fixes on xml import