Changes for virtualenv and installation