Multiple fixes for correct PFS deployment in venv.