Minor tweaks around the virtualenv