Fix some install issues