Small preparations for Install/Uninstall