Fixed install/uninstall