Minor cleanup + fix on uninstall