More changes for using virtualenv