Solved issue with virtualenv installed via easy_install + minor changes