Fixing bugs in tokens record (caused by new opal manager)