More install tweaks