[USR-TC] More NI2 issues