Some more tweaks to installation