More robust virtual env wrapper