More minor tweaks to combined installer scripts