More install fixes