Tweak installation setup a bit