Various fixes and improvements for pesos/virtualenv