fixes to uninstall