uhu-installer: separate patches