Some more install target fixes