A couple of fixes, build_virtualenv is still broken (m2crypto)