Minor changes and support for (unsafe) uninstallation