Bug fixes and integration with python_service.