x86: uv cleanup, build fix #2