Fixed few thing arount venv
Have no idea...
Master merge