Minor fixes and uninstall before installing added.