Fixed installation / uninstallation problems.