Minor tweaks to help with setup.