Minor tweaks to startup focus