Fix installation problems

Make some corrections during the installation process :)