fixes for supporting venv