Fix Installation & Uninstall Issues