Fixing links and xml