improve UID/GID patching