Some PYTHONPATH temporary fixes