Improve reinstall behavior