Fixing install/uninstall