More tweaks to install flow