Fix remaining InstallScript bugs