Fixed some install bugs