Fixing some install issues, halfway