uv fixes from mercurial