Tweaking our installation/uninstallation procedure