Fixed API and PYTHONPATH