Further virtualenv work