Small nitpicks
Fix xml paths.
Improved split logic.