Yet more install tweaks