TcRnDriver fixup