Minor tweaks to setup section