Minor tweaks to work with our setup.