Fix token/uvm generation