Some fixes on virtualenv