Fixing some more bugs connected with moving install script...