Fix some merge uninstall code