Prevent import collisions.
Relocate XIA correction stuff.