Fixes to xmlrepository