Update to latest xni changes