Uninstallation, various fixes