More uninstaller improvement