Fix some issues that stop the installer