Updated virtualenv support