Tracing update + PYTHONPATH fix from Wen