Backported UVL optimizations