Fixed uninstaller bugs