Fixed virtualenv issues