More installation procedure tweaks