Fix installation errors