Better handling of reinstalls.