More install fixes.