Fixes for XML harvester