Fix UVM generation