Minor tweaks to setup.