Fix improper oredict registrations
Force TE to load first, bump to X5