Base: Fix uninstall code