Fix installation problems