More PYTHONPATH tweaking