Fixing install and uninstall to work standalone