Tweaks to uninstall method